From 66b61c7d72a8926ce95f4154c90f1353d009b058 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Mon, 21 Dec 2020 14:39:01 +0100
Subject: [PATCH] Set artifactory registry as proxy to pull jobs' images
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 10 +++++-----
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 00f5bd2..d54b1c8 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1,4 +1,4 @@
-image: docker:git
+image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
@@ -128,7 +128,7 @@ bash_syntax:
##########################################################
markdown_syntax:
stage: postcheck
- script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+ script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
when: always
tags:
- docker
@@ -143,8 +143,8 @@ file_syntax:
stage: postcheck
script:
- RET=0
- - docker run -v ${PWD}:/ac cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- - docker run -v ${PWD}:/ac cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+ - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+ - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- exit $RET
when: always
tags:
@@ -157,7 +157,7 @@ file_syntax:
##########################################################
adoc_syntax:
stage: postcheck
- image: alpine
+ image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
before_script:
- apk add --update curl asciidoctor bash
script:
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index c22f303..0574691 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,4 +1,4 @@
-image: docker:git
+image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
@@ -130,7 +130,7 @@ bash_syntax:
##########################################################
markdown_syntax:
stage: postcheck
- script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+ script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
when: always
tags:
- docker
@@ -145,8 +145,8 @@ file_syntax:
stage: postcheck
script:
- RET=0
- - docker run -v ${PWD}:/ac cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- - docker run -v ${PWD}:/ac cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+ - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+ - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- exit $RET
when: always
tags:
@@ -159,7 +159,7 @@ file_syntax:
##########################################################
adoc_syntax:
stage: postcheck
- image: alpine
+ image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
before_script:
- apk add --update curl asciidoctor bash
script:
--
GitLab