From fb4500d1fc20982728af6622ca446b9941672fc7 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Tue, 11 Jan 2022 21:07:05 +0700 Subject: [PATCH] Fix Docker tag --- .github/workflows/on-master-push.yml | 4 +++- Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-master-push.yml b/.github/workflows/on-master-push.yml index 3597631..df38f69 100644 --- a/.github/workflows/on-master-push.yml +++ b/.github/workflows/on-master-push.yml @@ -13,7 +13,8 @@ jobs: name: Build and push Docker image runs-on: ubuntu-18.04 env: - TOR_VERSION: 0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 + TOR_VERSION: 0.4.6.8 + TOR_CHECKSUM: @sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 steps: - name: Login to Docker Hub run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin @@ -32,5 +33,6 @@ jobs: docker buildx build \ --platform linux/amd64,linux/arm64 \ --build-arg TOR_VERSION=$TOR_VERSION \ + --build-arg TOR_CHECKSUM=$TOR_CHECKSUM \ --tag ${{ secrets.DOCKER_HUB_USER }}/tor-server:$TOR_VERSION \ --push . \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 58dd387..ba3d820 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -ARG TOR_VERSION=0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 +ARG TOR_VERSION=0.4.6.8 +ARG TOR_CHECKSUM=@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 -FROM lncm/tor:$TOR_VERSION +FROM lncm/tor:${TOR_VERSION}${TOR_CHECKSUM} # Install s6 USER root