From d65a935718b51c38ab068bb9c518d7e2a2b8d765 Mon Sep 17 00:00:00 2001 From: fredbcode Date: Tue, 4 May 2021 16:04:53 +0200 Subject: [PATCH] Add missing tags arm for services --- gitlabci/docker-hub-arm.yml | 13 ++++++------- gitlabci/docker-hub.yml | 11 ++++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index e079207..f72b18c 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -21,16 +21,15 @@ docker-hub-build-arm: - 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 -services: - - name: $CONTAINER_BUILD_NOPROD_NAME_ARM - alias: squid - image: $CONTAINER_CLIENT_IMAGE - tags: - - arm +.services-arm: + services: + - name: $CONTAINER_BUILD_NOPROD_NAME_ARM + alias: squid + image: $CONTAINER_CLIENT_IMAGE docker-hub-test-arm: stage: Docker-hub-test - extends: .services + extends: .services-arm tags: - arm artifacts: diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml index 1b277a3..3716a25 100644 --- a/gitlabci/docker-hub.yml +++ b/gitlabci/docker-hub.yml @@ -19,14 +19,15 @@ docker-hub-build: - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 . - docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64 -services: - - name: $CONTAINER_BUILD_NOPROD_NAME_AMD64 - alias: squid - image: $CONTAINER_CLIENT_IMAGE +.services-amd64: + services: + - name: $CONTAINER_BUILD_NOPROD_NAME_AMD64 + alias: squid + image: $CONTAINER_CLIENT_IMAGE docker-hub-test: stage: Docker-hub-test - extends: .services + extends: .services-amd64 script: - apt update && apt install -y curl - export https_proxy=http://$CONTAINER_TEST_NAME:3128 && curl -k https://www.google.fr