From bddd0b2de04c78b2063da7bd2457f839d05b2c99 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Wed, 23 Dec 2020 22:11:57 +0100
Subject: [PATCH] Changes in registry and login
---
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 0574691..1e662ea 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,4 +1,4 @@
-image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
+image: docker:git
variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
@@ -14,6 +14,7 @@ stages:
before_script:
- apk add --update bash coreutils tar wget
+ - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
.industrial_ci:
stage: build
@@ -21,6 +22,7 @@ before_script:
- apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
+ - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
@@ -159,7 +161,7 @@ file_syntax:
##########################################################
adoc_syntax:
stage: postcheck
- image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
+ image: alpine
before_script:
- apk add --update curl asciidoctor bash
script:
--
GitLab