From 41670586ed4ae513f9316055f7664000c2672ed7 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 15 Jul 2020 10:42:15 -0500
Subject: [PATCH 1/2] Change push to use Docker Hub.

---
 .github/workflows/buildpack-deps.yml                       | 7 ++++---
 scripts/docker/buildpack-deps/Dockerfile.emscripten        | 2 +-
 .../buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz     | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu1804        | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004        | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang  | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index 48d83b77cd04..850f54fd07be 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -14,7 +14,8 @@ jobs:
   buildpack-deps:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      DOCKER_REPOSITORY: docker.pkg.github.com/${{ github.repository }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      DOCKER_REPOSITORY: aarlt/solidity-buildpack-deps
       IMAGE_NAME: buildpack-deps
 
     runs-on: ubuntu-latest
@@ -31,9 +32,9 @@ jobs:
 
       - name: Upgrade ${{ env.IMAGE_NAME }}-${{ matrix.image_variant }}
         run: |
-          echo "${GITHUB_TOKEN}" | docker login docker.pkg.github.com -u "${GITHUB_ACTOR}" --password-stdin
+          echo ${DOCKERHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin
           scripts/ci/docker_upgrade.sh ${{ env.IMAGE_NAME }} ${{ matrix.image_variant }} ${{ env.DOCKER_REPOSITORY }}
-          docker logout docker.pkg.github.com
+          docker logout
 
       - name: comment PR
         if: "env.DOCKER_IMAGE"
diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 8885e1302508..2d9ce401ddc1 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -29,7 +29,7 @@
 #   make version=1.39.15 build
 #
 FROM emscripten/emsdk:1.39.15 AS base
-LABEL version="0"
+LABEL version="1"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index add0bfec433e..ceea17d8180c 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang as base
-LABEL version="0"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804
index 34f1e674b866..51eed0a9e4ed 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1804
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:bionic AS base
-LABEL version="0"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 6c5486bd2776..591e430af77a 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="0"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index b38fe4f1a261..c1663fdba7a9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="0"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 54c52e3b51b8cf0707a624bc857e9a242bdd02b3 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 15 Jul 2020 14:40:23 -0500
Subject: [PATCH 2/2] Change tag structure.

---
 scripts/ci/docker_upgrade.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh
index a8212c2c24d4..16d6222305bf 100755
--- a/scripts/ci/docker_upgrade.sh
+++ b/scripts/ci/docker_upgrade.sh
@@ -54,15 +54,12 @@ docker run --rm --volume "${PWD}:/root/project" "${IMAGE_NAME}" "/root/project/s
 echo "-- push_docker"
 
 VERSION=$(docker inspect --format='{{.Config.Labels.version}}' "${IMAGE_NAME}")
-DOCKER_IMAGE_ID="${DOCKER_REPOSITORY}/${IMAGE_NAME}-${IMAGE_VARIANT}"
+DOCKER_IMAGE_ID="${DOCKER_REPOSITORY}:${IMAGE_VARIANT}"
 
-docker tag "${IMAGE_NAME}" "${DOCKER_IMAGE_ID}:${VERSION}"
-docker push "${DOCKER_IMAGE_ID}:${VERSION}"
+docker tag "${IMAGE_NAME}" "${DOCKER_IMAGE_ID}-${VERSION}"
+docker push "${DOCKER_IMAGE_ID}-${VERSION}"
 
-REPO_DIGEST=$(docker inspect --format='{{.RepoDigests}}' "${DOCKER_IMAGE_ID}:${VERSION}")
+REPO_DIGEST=$(docker inspect --format='{{.RepoDigests}}' "${DOCKER_IMAGE_ID}-${VERSION}")
 
-docker tag "${IMAGE_NAME}" "${DOCKER_IMAGE_ID}:latest"
-docker push "${DOCKER_IMAGE_ID}:latest"
-
-echo "::set-env name=DOCKER_IMAGE::${DOCKER_IMAGE_ID}:${VERSION}"
+echo "::set-env name=DOCKER_IMAGE::${DOCKER_IMAGE_ID}-${VERSION}"
 echo "::set-env name=DOCKER_REPO_DIGEST::${REPO_DIGEST}"