Skip to content
Snippets Groups Projects
Commit 16f2fb66 authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

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

Resolve "Change default docker registry"

Closes #27

See merge request !57
parents 2fe3924c 37b0aa9d
No related branches found
No related tags found
1 merge request!57Resolve "Change default docker registry"
Pipeline #47895 failed
shellcheck: shellcheck:
image: koalaman/shellcheck-alpine image: tecnalia-docker-dev.artifact.tecnalia.com/koalaman/shellcheck-alpine
script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh
tags: tags:
- docker - docker
...@@ -12,7 +12,7 @@ shellcheck: ...@@ -12,7 +12,7 @@ shellcheck:
# DL3008 Pin versions in apt-get install # DL3008 Pin versions in apt-get install
# A bit overkill # A bit overkill
dockerfiles: dockerfiles:
image: hadolint/hadolint:latest-debian image: tecnalia-docker-dev.artifact.tecnalia.com/hadolint/hadolint:latest-debian
script: script:
- RET=0 - RET=0
- hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1 - hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1
...@@ -22,7 +22,7 @@ dockerfiles: ...@@ -22,7 +22,7 @@ dockerfiles:
- docker - docker
yamllint: yamllint:
image: sdesbure/yamllint image: tecnalia-docker-dev.artifact.tecnalia.com/sdesbure/yamllint
script: yamllint $(find . -name '*.yml' -o -name '*.yaml') script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
tags: tags:
- docker - docker
......
image: docker:git image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
variables: variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE} TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
services: services:
- docker:dind - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
alias: docker
stages: stages:
- precheck - precheck
...@@ -159,7 +160,7 @@ file_syntax: ...@@ -159,7 +160,7 @@ file_syntax:
########################################################## ##########################################################
adoc_syntax: adoc_syntax:
stage: postcheck stage: postcheck
image: alpine image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
before_script: before_script:
- apk add --update curl asciidoctor bash - apk add --update curl asciidoctor bash
script: script:
......
image: docker:git image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
variables: variables:
TMPDIR: /builds/${CI_PROJECT_NAMESPACE} TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
services: services:
- docker:dind - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
alias: docker
stages: stages:
- precheck - precheck
...@@ -161,7 +162,7 @@ file_syntax: ...@@ -161,7 +162,7 @@ file_syntax:
########################################################## ##########################################################
adoc_syntax: adoc_syntax:
stage: postcheck stage: postcheck
image: alpine image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
before_script: before_script:
- apk add --update curl asciidoctor bash - apk add --update curl asciidoctor bash
script: script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment