From 20113607f808c802ad7edc4381bacedd33f9388e Mon Sep 17 00:00:00 2001 From: fredbcode Date: Tue, 2 Nov 2021 11:44:44 +0100 Subject: [PATCH] Add dumb-init for pid 1 --- gitlabci/docker-hub-arm.yml | 4 ++-- gitlabci/docker-hub.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index e56cff7..071fc60 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -66,8 +66,8 @@ push-docker-hub-arm: - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g') - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm - - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:latest - - docker push $HUB_REGISTRY_IMAGE:latest + - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:latest-arm + - docker push $HUB_REGISTRY_IMAGE:latest-arm variables: GIT_STRATEGY: none needs: ["docker-hub-test-arm"] diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index d1031cc..e4340d5 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -58,8 +58,8 @@ push-docker-hub: - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g') - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64 - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64 - - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest - - docker push $HUB_REGISTRY_IMAGE:latest + - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest-amd64 + - docker push $HUB_REGISTRY_IMAGE:latest-amd64 variables: GIT_STRATEGY: none needs: ["docker-hub-test"]