From 11d3801ce2b01a5e2fb8b1e61f3b8c4bd2cfe4cb Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Thu, 20 Feb 2025 23:17:46 +0100 Subject: [PATCH] Revert change --- conan-el6-gcc44-x86/.gitlab-ci.yml | 3 ++- conan-el6-gcc44/.gitlab-ci.yml | 2 +- conan-el6-gcc91-x86/.gitlab-ci.yml | 2 +- conan-el6-gcc91/.gitlab-ci.yml | 2 +- conan-el7-gcc112/.gitlab-ci.yml | 2 +- conan-el7-gcc114-conda-forge/.gitlab-ci.yml | 2 +- conan-el7-gcc115/.gitlab-ci.yml | 3 +-- conan-el7-gcc48-x86/.gitlab-ci.yml | 2 +- conan-el7-gcc48/.gitlab-ci.yml | 2 +- conan-el7-gcc93-x86/.gitlab-ci.yml | 2 +- conan-el7-gcc93/.gitlab-ci.yml | 2 +- conan-el9-gcc115/.gitlab-ci.yml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index 47f25aa..a06a0a3 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -19,11 +19,12 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build script: + - echo "DOCKER_HOST=$DOCKER_HOST" - docker build --pull -t ${CONTAINER_TEST_IMAGE} -f ${NAME}/Dockerfile . - docker push ${CONTAINER_TEST_IMAGE} diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index 83be0e3..456b1ba 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index eee5d4f..8da5704 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 97870b2..addb5a9 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc112/.gitlab-ci.yml b/conan-el7-gcc112/.gitlab-ci.yml index 77a8664..e84141d 100644 --- a/conan-el7-gcc112/.gitlab-ci.yml +++ b/conan-el7-gcc112/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml index 4ce594b..0d74aa4 100644 --- a/conan-el7-gcc114-conda-forge/.gitlab-ci.yml +++ b/conan-el7-gcc114-conda-forge/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc115/.gitlab-ci.yml b/conan-el7-gcc115/.gitlab-ci.yml index 590e07b..67c1ca8 100644 --- a/conan-el7-gcc115/.gitlab-ci.yml +++ b/conan-el7-gcc115/.gitlab-ci.yml @@ -20,8 +20,7 @@ stages: before_script: - echo "${CI_REGISTRY}" - - echo "${CI_REGISTRY_EXT}" - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index 411f49e..e58d0d8 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index 3b945f3..2d61a00 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index b07696a..7d30984 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index 498fa29..34b351d 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build diff --git a/conan-el9-gcc115/.gitlab-ci.yml b/conan-el9-gcc115/.gitlab-ci.yml index a6d53da..72a4363 100644 --- a/conan-el9-gcc115/.gitlab-ci.yml +++ b/conan-el9-gcc115/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: - release before_script: - - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY_EXT} -u ${CI_REGISTRY_USER} --password-stdin + - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin build: stage: build -- GitLab