From 45dfa2fd2e1596cfe71e6ea2f4e4fa13bf7fc6d3 Mon Sep 17 00:00:00 2001 From: Fred Date: Fri, 27 Aug 2021 08:30:52 +0000 Subject: [PATCH 1/4] Update v5 for x86 --- gitlabci/docker-hub.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index 219c14c..8d76ada 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -15,7 +15,7 @@ docker-hub-build: script: - cd $CI_PROJECT_DIR - apk add --no-cache curl - - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1) + - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1) - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 . - docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64 @@ -43,7 +43,7 @@ push-docker-hub: script: - apk add --no-cache curl - docker pull $CONTAINER_BUILD_NOPROD_NAME_AMD64 - - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g') + - 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 variables: From 26f44708f17fd6bc08309f24304f8790b12539da Mon Sep 17 00:00:00 2001 From: Fred Date: Fri, 27 Aug 2021 08:31:30 +0000 Subject: [PATCH 2/4] Update docker-hub-arm.yml --- gitlabci/docker-hub-arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index b9c4587..ad09cb6 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -17,7 +17,7 @@ docker-hub-build-arm: script: - cd $CI_PROJECT_DIR - apk add --no-cache curl - - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1) + - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1) - docker build -f Dockerfile.arm --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_ARM . - docker push $CONTAINER_BUILD_NOPROD_NAME_ARM @@ -51,7 +51,7 @@ push-docker-hub-arm: script: - apk add --no-cache curl - docker pull $CONTAINER_BUILD_NOPROD_NAME_ARM - - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v4/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g') + - 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 variables: From 646dd9fe970d16154dbea8738d66d2d8617644fe Mon Sep 17 00:00:00 2001 From: Fred Date: Fri, 27 Aug 2021 09:44:05 +0000 Subject: [PATCH 3/4] Add latest tag fox x86 --- gitlabci/docker-hub.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index 8d76ada..915646a 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -46,6 +46,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-amd64 + - docker push $HUB_REGISTRY_IMAGE:latest-amd64 variables: GIT_STRATEGY: none needs: ["docker-hub-test"] From 0d228f15905fab31b55c7979936deb2590de608f Mon Sep 17 00:00:00 2001 From: Fred Date: Fri, 27 Aug 2021 09:47:48 +0000 Subject: [PATCH 4/4] Add latest tag to arm --- gitlabci/docker-hub-arm.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index ad09cb6..983d110 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -54,6 +54,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-arm + - docker push $HUB_REGISTRY_IMAGE:latest-arm variables: GIT_STRATEGY: none needs: ["docker-hub-test-arm"]