Update workflows to use docker make targets

Author: janekbaraniewski

.github/workflows/docker.yml

@@ -12,9 +12,6 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        component: [server, client]
 
     steps:
     - name: Checkout code
@@ -31,12 +28,10 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and tag the Docker image
-      run: |
-        docker build . -f Dockerfile.${{ matrix.component }} \
-          -t ghcr.io/${{ github.repository }}/${{ matrix.component }}:${{ github.sha }} \
-          -t ghcr.io/${{ github.repository }}/${{ matrix.component }}:latest
+      run: make build-images
+
+    - name: tag images
+      run: make tag-images
 
     - name: Push Docker images to GitHub Packages
-      run: |
-        docker push ghcr.io/${{ github.repository }}/${{ matrix.component }}:${{ github.sha }}
-        docker push ghcr.io/${{ github.repository }}/${{ matrix.component }}:latest
+      run: make push-images

.github/workflows/test.yml

@@ -19,3 +19,15 @@ jobs:
     - name: Run tests
       run: make test
 
+  docker:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build and tag the Docker image
+      run: make build-images