From 78550e45dcfd01a37acfdddc2e72f87c1fd19ab9 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:45:02 +0200
Subject: [PATCH] ci
---
.docker/Dockerfile | 5 +++--
.gitlab-ci.yml | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 95cf770..d2ab421 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,5 +1,6 @@
FROM debian:latest
RUN apt-get update && \
- apt-get install tox curl -y
+ apt-get install tox curl python3-pip -y
+RUN pip3 install docker-compose
COPY wait-for-it.sh /wait-for-it.sh
-CMD /wait-for-it.sh caosdb-server:10443 -t 60 -- curl https://caosdb-server:10443
+CMD /bin/bash
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc0bba3..aca54ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,9 +53,10 @@ stages:
test:
tags: [docker]
- image:
- name: docker/compose:1.24.1
- entrypoint: ["/bin/sh", "-c"]
+ #image:
+ # name: docker/compose:1.24.1
+ # entrypoint: ["/bin/sh", "-c"]
+ image: $CI_REGISTRY_IMAGE:latest
script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd .docker
@@ -64,9 +65,8 @@ test:
#- rc=$?
#- docker-compose down
#- exit $rc
- - ./wait-for-it.sh localhost:10443 -t 60 -- echo "ready"
+ - ./wait-for-it.sh localhost:10443 -t 60 -- curl https://localhost:10443
- cd ..
- - tox
build-testenv:
tags: [docker]
--
GitLab