Commit a721e972 authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Merge branch '27-change-default-docker-registry' into 'master'

Resolve "Change default docker registry"

Closes #27

See merge request tecnalia_robotics-public/gitlab_templates!54
parents 11ce90c3 5e88ed01
...@@ -34,3 +34,5 @@ deploy_devcontainer: ...@@ -34,3 +34,5 @@ deploy_devcontainer:
paths: paths:
- dot_devcontainer.tar.gz - dot_devcontainer.tar.gz
expire_in: 1 year expire_in: 1 year
tags:
- docker
...@@ -14,6 +14,7 @@ stages: ...@@ -14,6 +14,7 @@ stages:
before_script: before_script:
- apk add --update bash coreutils tar wget - 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: .industrial_ci:
stage: build stage: build
...@@ -21,6 +22,7 @@ before_script: ...@@ -21,6 +22,7 @@ before_script:
- apk add --update bash coreutils tar - apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - 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 ${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 script: .ci_config/gitlab.sh
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
...@@ -128,7 +130,7 @@ bash_syntax: ...@@ -128,7 +130,7 @@ bash_syntax:
########################################################## ##########################################################
markdown_syntax: markdown_syntax:
stage: postcheck 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 when: always
tags: tags:
- docker - docker
...@@ -143,8 +145,8 @@ file_syntax: ...@@ -143,8 +145,8 @@ file_syntax:
stage: postcheck stage: postcheck
script: script:
- RET=0 - 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 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 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-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- exit $RET - exit $RET
when: always when: always
tags: tags:
......
...@@ -14,6 +14,7 @@ stages: ...@@ -14,6 +14,7 @@ stages:
before_script: before_script:
- apk add --update bash coreutils tar wget - 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: .industrial_ci:
stage: build stage: build
...@@ -21,6 +22,7 @@ before_script: ...@@ -21,6 +22,7 @@ before_script:
- apk add --update bash coreutils tar - apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - 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 ${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 script: .ci_config/gitlab.sh
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
...@@ -130,7 +132,7 @@ bash_syntax: ...@@ -130,7 +132,7 @@ bash_syntax:
########################################################## ##########################################################
markdown_syntax: markdown_syntax:
stage: postcheck 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 when: always
tags: tags:
- docker - docker
...@@ -145,8 +147,8 @@ file_syntax: ...@@ -145,8 +147,8 @@ file_syntax:
stage: postcheck stage: postcheck
script: script:
- RET=0 - 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 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 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-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
- exit $RET - exit $RET
when: always when: always
tags: tags:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment