diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index 1a76427..e778834 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -15,6 +15,7 @@ variables: CONTAINER_CLIENT_IMAGE: debian:buster CONTAINER_TEST_NAME: squid CONTAINER_BUILD_NOPROD_NAME: $HUB_REGISTRY_IMAGE:build-noprod + CONTAINER_BUILD_PROD_NAME: $HUB_REGISTRY_IMAGE:$SQUID_VERSION SQUID_VERSION: '"$SQUID_VERSION"' .services: @@ -39,11 +40,8 @@ push-docker-hub: - docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_TOKEN" $DOCKER_HUB_REGISTRY script: - docker pull $CONTAINER_BUILD_NOPROD_NAME - - export VERSION=$(docker run -i --entrypoint "/bin/sh" $CONTAINER_BUILD_NOPROD_NAME -c env | grep EN_SQUID_VERSION | cut -d'=' -f2) - - docker tag $CONTAINER_BUILD_NOPROD_NAME $HUB_REGISTRY_IMAGE:$VERSION - - docker push $HUB_REGISTRY_IMAGE:$VERSION + - docker tag $CONTAINER_BUILD_NOPROD_NAME $CONTAINER_BUILD_PROD_NAME + - docker push $CONTAINER_BUILD_PROD_NAME variables: GIT_STRATEGY: none - # Needed for escaping $" - SQUID_VERSION: '"$SQUID_VERSION"'