From 4d7f1d342de17880afc58f3e0b818ccd17b7b8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Fri, 2 Aug 2019 13:24:19 +0200
Subject: [PATCH] MAINT: fix the docker version; remove header markers;
DOCKER_HOST is no longer required
---
.gitlab-ci.yml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fccefd25..f559b024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
#
-# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2018 Research Group Biomedical Physics,
@@ -18,20 +17,15 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# ** end header
-#
variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-advanced-testenv
- # With dind the docker deamon is available on the network
- DOCKER_HOST: tcp://docker:2375/
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
DOCKER_DRIVER: overlay2
services:
- - docker:dind
+ - docker:19.03-dind
stages:
- setup
@@ -60,7 +54,7 @@ test:
build-testenv:
tags: [docker]
- image: docker:latest
+ image: docker:19.03
stage: setup
script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
--
GitLab