diff --git a/.gitea/workflows/build_RC.yml b/.gitea/workflows/build_RC.yml index e81069fa..3db84ccd 100644 --- a/.gitea/workflows/build_RC.yml +++ b/.gitea/workflows/build_RC.yml @@ -89,7 +89,7 @@ jobs: - name: Build and push adminfront RC image uses: docker/build-push-action@v5 with: - context: ./adminfront + context: . file: ./adminfront/Dockerfile push: true tags: ${{ vars.HARBOR_HOSTNAME }}/baron_sso/adminfront:${{ steps.rc_calculator.outputs.new_rc_tag }} @@ -99,7 +99,7 @@ jobs: - name: Build and push devfront RC image uses: docker/build-push-action@v5 with: - context: ./devfront + context: . file: ./devfront/Dockerfile push: true tags: ${{ vars.HARBOR_HOSTNAME }}/baron_sso/devfront:${{ steps.rc_calculator.outputs.new_rc_tag }} @@ -109,7 +109,7 @@ jobs: - name: Build and push orgfront RC image uses: docker/build-push-action@v5 with: - context: ./orgfront + context: . file: ./orgfront/Dockerfile push: true tags: ${{ vars.HARBOR_HOSTNAME }}/baron_sso/orgfront:${{ steps.rc_calculator.outputs.new_rc_tag }} diff --git a/docker/staging_pull_compose.template.yaml b/docker/staging_pull_compose.template.yaml index efea8aff..42a19202 100644 --- a/docker/staging_pull_compose.template.yaml +++ b/docker/staging_pull_compose.template.yaml @@ -425,8 +425,8 @@ services: adminfront: build: - context: ./adminfront - dockerfile: Dockerfile + context: . + dockerfile: ./adminfront/Dockerfile container_name: baron_adminfront env_file: - .env @@ -451,8 +451,8 @@ services: devfront: build: - context: ./devfront - dockerfile: Dockerfile + context: . + dockerfile: ./devfront/Dockerfile container_name: baron_devfront env_file: - .env @@ -477,8 +477,8 @@ services: orgfront: build: - context: ./orgfront - dockerfile: Dockerfile + context: . + dockerfile: ./orgfront/Dockerfile container_name: baron_orgfront env_file: - .env diff --git a/test/staging_frontend_deploy_policy_test.sh b/test/staging_frontend_deploy_policy_test.sh index 13bc4153..588eaf3b 100644 --- a/test/staging_frontend_deploy_policy_test.sh +++ b/test/staging_frontend_deploy_policy_test.sh @@ -66,6 +66,12 @@ assert_contains "$userfront_dockerfile" "RUN flutter build web --release --wasm" assert_contains "$userfront_dockerfile" "FROM alpine:3.23 AS production" assert_contains "$pull_compose" "baron_devfront" assert_contains "$pull_compose" "baron_orgfront" +for app in adminfront devfront orgfront; do + assert_contains "$pull_compose" "$app:" + assert_contains "$pull_compose" "context: ." + assert_contains "$pull_compose" "dockerfile: ./$app/Dockerfile" + assert_not_contains "$pull_compose" "context: ./$app" +done assert_contains "$pull_compose" "dockerfile: userfront/Dockerfile" assert_not_contains "$pull_compose" 'target: ${USERFRONT_BUILD_TARGET:-dev}' assert_not_contains "$pull_compose" "target: dev" @@ -77,6 +83,12 @@ assert_contains "$pull_compose" 'APP_ENV=${APP_ENV:-stage}' assert_contains "$deploy_compose" "sh ./scripts/runtime-mode.sh" assert_not_contains "$deploy_compose" "command: npm run dev" +for app in adminfront devfront orgfront; do + assert_contains ".gitea/workflows/build_RC.yml" "Build and push $app RC image" + assert_contains ".gitea/workflows/build_RC.yml" "file: ./$app/Dockerfile" + assert_not_contains ".gitea/workflows/build_RC.yml" "context: ./$app" +done + assert_contains "$adminfront_vite" "/tmp/baron-sso-adminfront-dist" assert_contains "$adminfront_vite" "/tmp/baron-sso-adminfront-vite-cache" assert_contains "adminfront/biome.json" '".vite"'