diff --git a/.github/workflows/cd-api.yaml b/.github/workflows/cd-api.yaml index cd584d71..f15a6b03 100644 --- a/.github/workflows/cd-api.yaml +++ b/.github/workflows/cd-api.yaml @@ -1,4 +1,4 @@ -name: API +name: CD - API on: push: diff --git a/.github/workflows/cd-backup.yaml b/.github/workflows/cd-backup.yaml index 8ab5aef8..37592e38 100644 --- a/.github/workflows/cd-backup.yaml +++ b/.github/workflows/cd-backup.yaml @@ -1,4 +1,4 @@ -name: Backup +name: CD - Backup on: workflow_dispatch: diff --git a/.github/workflows/cd-schema-spy.yaml b/.github/workflows/cd-schema-spy.yaml index fbc7b021..0bd8bc23 100644 --- a/.github/workflows/cd-schema-spy.yaml +++ b/.github/workflows/cd-schema-spy.yaml @@ -1,4 +1,4 @@ -name: Schema-Spy +name: CD - Schema-Spy on: workflow_dispatch: diff --git a/.github/workflows/cd-web.yaml b/.github/workflows/cd-web.yaml index 9724b82c..8b96a466 100644 --- a/.github/workflows/cd-web.yaml +++ b/.github/workflows/cd-web.yaml @@ -1,4 +1,4 @@ -name: Web +name: CD - Web on: push: @@ -17,6 +17,7 @@ env: GITOPS_LICENCE_PLATE: b3c707 ARTIFACTORY_REPO: artifacts.developer.gov.bc.ca ARTIFACTORY_IMAGE_PATH: sbc3-images + WEB_BASE_HREF: / jobs: builds: @@ -43,10 +44,11 @@ jobs: artifactory_repo: ${{ env.ARTIFACTORY_REPO }} artifactory_image_path: ${{ env.ARTIFACTORY_IMAGE_PATH }} build_dockerfile: web/Dockerfile.release - build_docker_args: | - NGINX_RUNTIME_SRC='./docker/nginx-runtime' - VUE_ON_NGINX_SRC='./docker/vue-on-nginx' - WEB_SRC='./docker/web' + docker_build_args: | + WEB_BASE_HREF=${{ env.WEB_BASE_HREF }} + NGINX_RUNTIME_SRC='../../docker/nginx-runtime' + VUE_ON_NGINX_SRC='../../docker/vue-on-nginx' + WEB_SRC='../../web' - name: Update ArgoCD Repo id: update_argo_repo