ci(docker): use Docker Compose to build image

Standardises the method used to build the image, avoiding future naming conflicts and unnecessary rebuilds. Refs #390
PREreview · Jul 22, 2021 · 6cf476f · 6cf476f
1 parent 4d3c3b2
commit 6cf476f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/deploy_prereview-dev.yml b/.github/workflows/deploy_prereview-dev.yml
@@ -10,6 +10,7 @@ on:
 
 env:
   DOCKER_BUILDKIT: 1
+  IMAGE_TAG: ${{ github.sha }}
 
 jobs:
   build-and-deploy:
@@ -32,14 +33,14 @@ jobs:
         password: ${{ secrets.REGISTRY_PASSWORD }}
 
     - name: 'Build image'
-      run: docker build . -t prereview.azurecr.io/prereview:${{ github.sha }}
+      run: docker-compose build prereview
 
     - name: 'Tag image'
-      run: docker tag prereview.azurecr.io/prereview:${{ github.sha }} prereview.azurecr.io/prereview:develop
+      run: docker tag prereview.azurecr.io/prereview:${IMAGE_TAG} prereview.azurecr.io/prereview:develop
 
     - name: 'Push image'
       run: |
-        docker push prereview.azurecr.io/prereview:${{ github.sha }}
+        docker push prereview.azurecr.io/prereview:${IMAGE_TAG}
         docker push prereview.azurecr.io/prereview:develop
 
     - uses: azure/webapps-deploy@v2

diff --git a/.github/workflows/deploy_prereview-staging.yml b/.github/workflows/deploy_prereview-staging.yml
@@ -10,6 +10,7 @@ on:
 
 env:
   DOCKER_BUILDKIT: 1
+  IMAGE_TAG: ${{ github.sha }}
 
 jobs:
   build-and-deploy:
@@ -32,14 +33,14 @@ jobs:
         password: ${{ secrets.REGISTRY_PASSWORD }}
 
     - name: 'Build image'
-      run: docker build . -t prereview.azurecr.io/prereview:${{ github.sha }}
+      run: docker-compose build prereview
 
     - name: 'Tag image'
-      run: docker tag prereview.azurecr.io/prereview:${{ github.sha }} prereview.azurecr.io/prereview:latest
+      run: docker tag prereview.azurecr.io/prereview:${IMAGE_TAG} prereview.azurecr.io/prereview:latest
 
     - name: 'Push image'
       run: |
-        docker push prereview.azurecr.io/prereview:${{ github.sha }}
+        docker push prereview.azurecr.io/prereview:${IMAGE_TAG}
         docker push prereview.azurecr.io/prereview:latest
 
     - uses: azure/webapps-deploy@v2

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: "3"
 services:
   prereview:
+    image: prereview.azurecr.io/prereview:${IMAGE_TAG:-local}
     build: .
     depends_on:
       - prereview-db