Skip to content
Snippets Groups Projects
Commit 5de48933 authored by Henrik tom Woerden's avatar Henrik tom Woerden
Browse files

Merge branch 'fix_ci' into 'dev'

fix gitlab ci by setting docker versions

See merge request bmp-caosdb/caosdb-pylib!4
parents 0e9d630f 524a0937
No related branches found
No related tags found
No related merge requests found
#
# ** 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-pylib-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
image: $CI_REGISTRY_IMAGE:latest
......@@ -75,7 +69,7 @@ trigger_build:
# Build a docker image in which tests for this repository can run
build-testenv:
tags: [ docker ]
image: docker:latest
image: docker:19.03
stage: setup
script:
- cd unittests/docker
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment