From 0c42032b3257b6b88d4adf9b7fc8aadd54e46fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 12:56:08 +0200
Subject: [PATCH] ci

---
 .docker/Dockerfile | 2 +-
 .gitlab-ci.yml     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index d2ab421..5aa884a 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:latest
 RUN apt-get update && \
-	apt-get install tox curl python3-pip -y
+	apt-get install docker.io tox curl python3-pip -y
 RUN pip3 install docker-compose
 COPY wait-for-it.sh /wait-for-it.sh
 CMD /bin/bash
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aca54ba..3aba895 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ variables:
    # When using dind, it's wise to use the overlayfs driver for
    # improved performance.
    DOCKER_DRIVER: overlay2
-   CAOSDB_TAG: latest
+   : latest
 
 services:
   - docker:dind
@@ -58,6 +58,9 @@ test:
   #  entrypoint: ["/bin/sh", "-c"]
   image: $CI_REGISTRY_IMAGE:latest
   script:
+      - if [[ "$CAOSDB_TAG" == "" ]]; then
+            CAOSDB_TAG=latest
+        fi
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - cd .docker
       - docker-compose  up -d
-- 
GitLab