Update Docker image references

bcgov · Feb 29, 2024 · 5bebcff · 5bebcff
1 parent 4b0b5cd
commit 5bebcff
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/archive/build-push-all-images.yml b/.github/workflows/archive/build-push-all-images.yml
@@ -85,9 +85,9 @@ jobs:
 
       - name: 🛠️ Pull Cron Image
         run: |
-          docker pull ${{env.CRON_IMAGE}}
-          docker tag ${{env.CRON_IMAGE}} ${{ secrets.ARTIFACTORY_URL }}/${{env.CRON_IMAGE}}
-          docker push ${{ secrets.ARTIFACTORY_URL }}/${{env.CRON_IMAGE}}
+          docker pull ${{ env.CRON_IMAGE }}
+          docker tag ${{ env.CRON_IMAGE }} ${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_IMAGE }}
+          docker push ${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_IMAGE }}
 
       - name: 🛠️ Pull DB Image
         run: |

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -84,9 +84,9 @@ jobs:
 
       - name: 🛠️ Pull Cron base image
         run: |
-          docker pull ${{env.CRON_IMAGE}}
-          docker tag ${{env.CRON_IMAGE}} ${{ secrets.ARTIFACTORY_URL }}/${{env.CRON_IMAGE}}
-          docker push ${{ secrets.ARTIFACTORY_URL }}/${{env.CRON_IMAGE}}
+          docker pull ${{ env.CRON_IMAGE }}
+          docker tag ${{ env.CRON_IMAGE }} ${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_IMAGE }}
+          docker push ${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_IMAGE }}
 
       - name: 🛠️ Build and push CRON Image
-        run: docker buildx build --tag ${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_DEPLOYMENT_NAME }}:${{ env.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }} --output=type=image,push=true --push -f ${{ env.CRON_DOCKER_FILE_PATH }} .
+        run: docker buildx build --build-arg DOCKER_FROM_IMAGE=${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_IMAGE }} --tag ${{ secrets.ARTIFACTORY_URL }}/${{ env.CRON_DEPLOYMENT_NAME }}:${{ env.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }} --output=type=image,push=true --push -f ${{ env.CRON_DOCKER_FILE_PATH }} .
diff --git a/.github/workflows/moodle.yml b/.github/workflows/moodle.yml
@@ -85,5 +85,5 @@ jobs:
           docker push ${{ secrets.ARTIFACTORY_URL }}/${{ env.PHP_IMAGE }}
 
       - name: 🛠️ Build Moodle Image and push to Artifactory
-        run: docker buildx build --tag ${{ secrets.ARTIFACTORY_URL }}/${{ env.MOODLE_DEPLOYMENT_NAME }}:${{ env.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }} --output=type=image,push=true --push -f ${{ env.MOODLE_DOCKER_FILE_PATH }} .
+        run: docker buildx build --build-arg DOCKER_FROM_IMAGE=${{ secrets.ARTIFACTORY_URL }}/${{ env.PHP_IMAGE }} --tag ${{ secrets.ARTIFACTORY_URL }}/${{ env.MOODLE_DEPLOYMENT_NAME }}:${{ env.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }} --output=type=image,push=true --push -f ${{ env.MOODLE_DOCKER_FILE_PATH }} .
 
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -87,4 +87,4 @@ jobs:
 
       # Build PHP Image and push to Artifactory
       - name: 🛠️ Build PHP Image and push to Artifactory
-        run: docker buildx build --tag ${{ secrets.ARTIFACTORY_URL }}/${{ env.PHP_DEPLOYMENT_NAME }}:${{ env.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }} --output=type=image,push=true --push -f ${{ env.PHP_DOCKER_FILE_PATH }} .
+        run: docker buildx build --build-arg DOCKER_FROM_IMAGE=${{ secrets.ARTIFACTORY_URL }}/${{ env.PHP_IMAGE }} --tag ${{ secrets.ARTIFACTORY_URL }}/${{ env.PHP_DEPLOYMENT_NAME }}:${{ env.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }} --output=type=image,push=true --push -f ${{ env.PHP_DOCKER_FILE_PATH }} .