Commit 9683c178 authored by Henrik tom Woerden's avatar Henrik tom Woerden
Browse files

fix gitlab ci by setting docker versions

parent 2c65efb8
# #
# ** header v3.0
# This file is a part of the CaosDB Project. # This file is a part of the CaosDB Project.
# #
# Copyright (C) 2018 Research Group Biomedical Physics, # Copyright (C) 2018 Research Group Biomedical Physics,
...@@ -18,20 +17,15 @@ ...@@ -18,20 +17,15 @@
# #
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ** end header
#
variables: variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-webui-testenv CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-webui-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 # When using dind, it's wise to use the overlayfs driver for
# improved performance. # improved performance.
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services: services:
- docker:dind - docker:19.03-dind
image: $CI_REGISTRY_IMAGE:latest image: $CI_REGISTRY_IMAGE:latest
...@@ -78,7 +72,7 @@ trigger_build: ...@@ -78,7 +72,7 @@ trigger_build:
# Build a docker image in which tests for this repository can run # Build a docker image in which tests for this repository can run
build-testenv: build-testenv:
tags: [ docker ] tags: [ docker ]
image: docker:latest image: docker:19.03
stage: setup stage: setup
script: script:
- cd test/docker - cd test/docker
......
Markdown is supported
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