Commit 4eb9c0a5d0c28d6194bfc0ff25eff9b2851b4499

Edward Thomson 2020-06-06T20:57:51

Update main.yml

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c8a9f44..fa1d99f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,10 +34,10 @@ jobs:
         echo "::set-env name=docker-sha-tag::test3-$(git log -1 --pretty=format:"%h" -- ${{ env.docker-config-path }})"
     - name: Download existing image
       run: |
-        docker login https://docker.pkg.github.com -u ${{github.actor}} -p ${{github.token}}
+        docker login https://${{ env.docker-registry }} -u ${{ github.actor }} -p ${{ github.token }}
 
         echo "::set-env name=docker-container-exists::true"
-        docker pull ${{ env.docker-container-url }}:${{ env.docker-sha-tag }} || echo "::set-env name=docker-container-exists::false"
+        docker pull ${{ env.docker-registry }}/${{ env.docker-container }}:${{ env.docker-sha-tag }} || echo "::set-env name=docker-container-exists::false"
     - name: Build and publish image
       run: |
         docker build -t ${{ env.docker-registry }}/${{ env.docker-container }}:${{ env.docker-sha-tag }} --build-arg BASE=${{ matrix.container.base }} -f ${{ matrix.container.name }} .