summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2020-06-06 20:57:51 +0100
committerGitHub <noreply@github.com>2020-06-06 20:57:51 +0100
commit4eb9c0a5d0c28d6194bfc0ff25eff9b2851b4499 (patch)
treee7c5d9e1f38b273349144947d555c84e7927925f
parent7861a86b2daf77772911f5cf58d0d1babc035180 (diff)
downloadlibgit2-4eb9c0a5d0c28d6194bfc0ff25eff9b2851b4499.tar.gz
Update main.yml
-rw-r--r--.github/workflows/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c8a9f4494..fa1d99fd1 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 }} .