Make sure that we publish to both docker.io and ghcr.io.

1 files changed, 19 insertions, 11 deletions

diff --git a/screwdriver/release-container-image.sh b/screwdriver/release-container-image.sh
index 4d2bbf8a4ec..87f06762169 100755
--- a/screwdriver/release-container-image.sh
+++ b/screwdriver/release-container-image.sh
@@ -10,11 +10,6 @@ fi
 
 readonly VESPA_VERSION=$1
 
-if curl -fsSL https://index.docker.io/v1/repositories/vespaengine/vespa/tags/$VESPA_VERSION &> /dev/null; then
-    echo "Container image docker.io/vespaengine/vespa:$VESPA_VERSION aldready exists."
-    exit 0
-fi
-
 if [[ -z "$DOCKER_HUB_DEPLOY_KEY" ]]; then
     echo "Environment variable DOCKER_HUB_DEPLOY_KEY must be set, but is empty."
     exit 1
@@ -31,14 +26,27 @@ cd $BUILD_DIR
 git clone --depth 1 https://github.com/vespa-engine/docker-image
 cd docker-image
 
-docker build --build-arg VESPA_VERSION=$VESPA_VERSION --tag docker.io/vespaengine/vespa:$VESPA_VERSION --tag docker.io/vespaengine/vespa:latest .
+docker build --build-arg VESPA_VERSION=$VESPA_VERSION \
+       --tag docker.io/vespaengine/vespa:$VESPA_VERSION --tag docker.io/vespaengine/vespa:latest \
+       --tag ghcr.io/vespa-engine/vespa:$VESPA_VERSION  --tag ghcr.io/vespa-engine/vespa:latest .
 
 # Push to Docker Hub
 docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY"
-docker push docker.io/vespaengine/vespa:$VESPA_VERSION
-docker push docker.io/vespaengine/vespa:latest
+if curl -fsSL https://index.docker.io/v1/repositories/vespaengine/vespa/tags/$VESPA_VERSION &> /dev/null; then
+    echo "Container image docker.io/vespaengine/vespa:$VESPA_VERSION aldready exists."
+else
+    docker push docker.io/vespaengine/vespa:$VESPA_VERSION
+    docker push docker.io/vespaengine/vespa:latest
+fi
 
 # Push to GitHub Container Registry
-docker login --username aressem --password "$DOCKER_HUB_DEPLOY_KEY" ghcr.io
-docker push ghcr.io/vespa-engine/vespa:$VESPA_VERSION
-docker push ghcr.io/vespa-engine/vespa:latest
+docker login --username aressem --password "$GHCR_DEPLOY_KEY" ghcr.io
+JWT=$(curl -sSL -u aressem:$GHCR_DEPLOY_KEY "https://ghcr.io/token?service=ghcr.io&scope=repository:vespa-engine/vespa:pull" | jq -re '.token')
+IMAGE_TAGS=$(curl -sSL -H "Authorization: Bearer $JWT" https://ghcr.io/v2/vespa-engine/vespa/tags/list | jq -re '.tags[]')
+if grep $VESPA_VERSION <<< "$IMAGE_TAGS" &> /dev/null; then
+    echo "Container image ghcr.io/vespa-engine/vespa:$VESPA_VERSION aldready exists."
+else
+    docker push ghcr.io/vespa-engine/vespa:$VESPA_VERSION
+    docker push ghcr.io/vespa-engine/vespa:latest
+fi
+