Commit e45de4ef authored by Carlos Juliano Viana's avatar Carlos Juliano Viana Committed by Renato Figueiro Maia
Browse files

- Atualizando a imagem do docker de 18-git para 20.10.2-git.

- Removendo template de login no proxy e seu uso nos jobs.
- Atualizando a imagem docker do template de serviço de 18-dind para 20.10.2-dind.
- Removendo variável DOCKER_HOST: Variável configurada no runner.

[SOMA-7307]
[SOMA-7207]
parent e2b6bc0e
......@@ -2,27 +2,25 @@
# Global Templates
#-------------------------
.docker_image_template: &docker_image_template
image: $CI_REGISTRY_PROXY_URL/docker:18-git
image: $CI_REGISTRY_PROXY_URL/docker:20.10.2-git
.docker_login: &docker_login
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY_URL
.docker_login_proxy: &docker_login_proxy
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY_PROXY_URL
.helm_kubectl_image_template: &helm_kubectl_image_template
image: repo.tecgraf.puc-rio.br:18089/soma/helm-kubectl:0.0.1
.services_docker_dind_template: &services_docker_dind_template
services:
- name: $CI_REGISTRY_PROXY_URL/docker:18-dind
- name: $CI_REGISTRY_PROXY_URL/docker:20.10.2-dind
alias: docker
#-------------------------
# Global Variables
#-------------------------
variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""
#-------------------------
# Job Stages
......@@ -103,8 +101,7 @@ test:
<<: *docker_image_template
<<: *services_docker_dind_template
script:
- *docker_login_proxy
- export DOCKER_BUILDKIT=1
- export DOCKER_BUILDKIT=1
- source shared-vars.sh
- export DOCKER_REGISTRY=${CI_REGISTRY_URL:+$CI_REGISTRY_URL/}
- export DOCKER_REGISTRY_IMAGE_DIND="${CI_REGISTRY_IMAGE}-dind"
......@@ -148,7 +145,6 @@ docker_release:
<<: *docker_image_template
<<: *services_docker_dind_template
script:
- *docker_login_proxy
- source shared-vars.sh
- cat ${CI_KUBE_CONFIG_FILE} > .kube/kube-config.yaml
- sed -i.bak "s/__VERSION__/${VERSION}/" kubernetes/posix/helm/Chart.yaml
......
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