diff --git a/.github/workflows/docker-build-dev2.yml b/.github/workflows/docker-build-dev2.yml index 8b5911c07..5a9cad542 100644 --- a/.github/workflows/docker-build-dev2.yml +++ b/.github/workflows/docker-build-dev2.yml @@ -71,10 +71,14 @@ jobs: contents: read steps: - uses: actions/checkout@v6 + - name: Resolve build version (from dev) and revision (dev2's own commit) + run: | + echo "UGM_BUILD_VERSION=$(gh variable get UGM_BUILD_VERSION --env dev)" >> $GITHUB_ENV + echo "UGM_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}}" >> $GITHUB_ENV - name: Build Docker images run: | rm -f ./docker-compose.override.yml - docker build --build-arg UNITY_BUILD_VERSION=dev2 --build-arg UNITY_BUILD_REVISION=${{needs.Branch.outputs.SHA_SHORT}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile . + docker build --build-arg UNITY_BUILD_VERSION=${{env.UGM_BUILD_VERSION}} --build-arg UNITY_BUILD_REVISION=${{env.UGM_BUILD_REVISION}} -t unity-grantmanager-web -f src/Unity.GrantManager.Web/Dockerfile . docker build -t unity-grantmanager-dbmigrator -f src/Unity.GrantManager.DbMigrator/Dockerfile . working-directory: ./applications/Unity.GrantManager - name: Push application images to Artifactory container registry