diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index 10cba91..6e8fc15 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -18,7 +18,7 @@ docker-hub-build-arm: - 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) - - docker build -f Dockerfile.arm --build-arg SQUID_VERSION=$SQUID_VERSION --platform linux/arm/v7 --pull -t $CONTAINER_BUILD_NOPROD_NAME . + - docker build -f Dockerfile.arm --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME . - docker push $CONTAINER_BUILD_NOPROD_NAME .services: @@ -52,7 +52,7 @@ push-docker-hub-arm: - apk add --no-cache curl - docker pull $CONTAINER_BUILD_NOPROD_NAME - 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') - - docker tag $CONTAINER_BUILD_NOPROD_NAME $HUB_REGISTRY_IMAGE:$SQUID_VERSION + - docker tag $CONTAINER_BUILD_NOPROD_NAME $HUB_REGISTRY_IMAGE:$SQUID_VERSION_arm - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION variables: GIT_STRATEGY: none diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index be271af..f2fc578 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -44,7 +44,7 @@ push-docker-hub: - apk add --no-cache curl - docker pull $CONTAINER_BUILD_NOPROD_NAME - 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') - - docker tag $CONTAINER_BUILD_NOPROD_NAME $HUB_REGISTRY_IMAGE:$SQUID_VERSION + - docker tag $CONTAINER_BUILD_NOPROD_NAME $HUB_REGISTRY_IMAGE:$SQUID_VERSION_amd64 - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION variables: GIT_STRATEGY: none