From af09fef6e76ac49954b4bd4670fdef4424fce8fb Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Wed, 28 Apr 2021 16:29:47 +0200
Subject: [PATCH] Pull images from all-docker-dev artifactory registry instead
of dockerhub
---
.gitlab-ci.yml | 6 +++---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 10 +++++-----
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ab0b3c..5bca2ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
shellcheck:
- image: koalaman/shellcheck-alpine
+ image: all-docker-dev.artifact.tecnalia.com/koalaman/shellcheck-alpine
script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh
tags:
- docker
@@ -12,7 +12,7 @@ shellcheck:
# DL3008 Pin versions in apt-get install
# A bit overkill
dockerfiles:
- image: hadolint/hadolint:latest-debian
+ image: all-docker-dev.artifact.tecnalia.com/hadolint/hadolint:latest-debian
script:
- RET=0
- hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1
@@ -22,7 +22,7 @@ dockerfiles:
- docker
yamllint:
- image: sdesbure/yamllint
+ image: all-docker-dev.artifact.tecnalia.com/sdesbure/yamllint
script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
tags:
- docker
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 24fc6d1..7784163 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: all-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 tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+ script: docker run -v ${PWD}:/ac all-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 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
+ - docker run -v ${PWD}:/ac all-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 all-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: all-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 1e662ea..7871d85 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: all-docker-dev.artifact.tecnalia.com/docker:git
variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
@@ -132,7 +132,7 @@ bash_syntax:
##########################################################
markdown_syntax:
stage: postcheck
- 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"
+ script: docker run -v ${PWD}:/ac all-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
@@ -147,8 +147,8 @@ file_syntax:
stage: postcheck
script:
- RET=0
- - 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
+ - docker run -v ${PWD}:/ac all-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 all-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:
@@ -161,7 +161,7 @@ file_syntax:
##########################################################
adoc_syntax:
stage: postcheck
- image: alpine
+ image: all-docker-dev.artifact.tecnalia.com/alpine
before_script:
- apk add --update curl asciidoctor bash
script:
--
GitLab