From a0db878f5b7548dc6e161218a66fc27c9b6f094e Mon Sep 17 00:00:00 2001 From: ssube Date: Thu, 5 Aug 2021 22:26:18 -0500 Subject: [PATCH] fix(build): add docker TLS options, remove codecov job --- .gitlab-ci.yml | 11 ----------- config/gitlab/ci-tools.yml | 17 +++++++---------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2ca8ef..ba3586b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,17 +63,6 @@ climate-success: script: - make upload-climate -codecov-success: - stage: status-post - extends: - - .build-codecov - - when: on_success - dependencies: - - build-node - script: - - make upload-codecov - github-pending: stage: status-pre extends: diff --git a/config/gitlab/ci-tools.yml b/config/gitlab/ci-tools.yml index 8a313d5..6e37106 100644 --- a/config/gitlab/ci-tools.yml +++ b/config/gitlab/ci-tools.yml @@ -23,17 +23,10 @@ GIT_BRANCH: "${CI_COMMIT_REF_NAME}" GIT_COMMIT_SHA: "${CI_COMMIT_SHA}" -.build-codecov: - image: docker.artifacts.apextoaster.com/apextoaster/codecov:3.7 - tags: - - platform:k8s - - runner:shared - allow_failure: false - .build-docker: - image: docker.artifacts.apextoaster.com/apextoaster/docker:18.09 + image: docker.artifacts.apextoaster.com/apextoaster/docker:20.10 services: - - apextoaster/docker-dind:18.09 + - docker.artifacts.apextoaster.com/apextoaster/docker-dind:20.10 tags: - platform:k8s - runner:shared @@ -48,8 +41,12 @@ - rm -rfv ${HOME}/.docker variables: + DOCKER_CERT_PATH: "/shared/docker/client" DOCKER_DRIVER: overlay2 - DOCKER_HOST: tcp://localhost:2375 + DOCKER_HOST: tcp://localhost:2376 + DOCKER_TLS_CERTDIR: "/shared/docker" + DOCKER_TLS_VERIFY: 1 + IMAGE_ROOT: "${CI_PROJECT_DIR}" .build-node: image: docker.artifacts.apextoaster.com/apextoaster/node:16.6