From 5edffb3230171538017245307f1c509dd0b95c35 Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Mon, 29 Jul 2019 14:58:16 +0200 Subject: [PATCH] ci: update docker; no need for TLS in internal env https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 (cherry picked from commit aa0f64c79f83f887a2083d8413fb7c91b7468107) --- .gitlab-ci.yml | 2 ++ ci/environment.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3bee035..c14effd41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ variables: PIPENV_VENV_IN_PROJECT: "true" PIPENV_CACHE_DIR: ".cache/" + # No need for TLS because everything runs on the same machine + DOCKER_TLS_CERTDIR: "" stages: - environment - prebuild diff --git a/ci/environment.yml b/ci/environment.yml index 3f7ea2ac4..68650f978 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -1,6 +1,6 @@ environment: stage: environment - image: docker:18.09.6 + image: docker variables: GIT_SUBMODULE_STRATEGY: none # no need to fetch submodules CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/environment"