From 3a4385c23718b82386f649a8674a919ac25371cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 14:50:09 +0200
Subject: [PATCH] ci
---
.docker/Dockerfile | 6 ++++--
.gitlab-ci.yml | 3 +--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 4252430..b72250f 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -3,5 +3,7 @@ RUN apt-get update && \
apt-get install docker.io tox curl python3-pip -y
RUN pip3 install docker-compose
COPY wait-for-it.sh /wait-for-it.sh
-COPY ../tests /tests
-CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox /tests
+COPY . /git
+RUN rm -r /git/.git
+WORKDIR /git
+CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 844a064..464a1cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,10 +78,9 @@ build-testenv:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE:latest || true
- - cd .docker
- docker build
--pull
- --file Dockerfile
+ --file .docker/Dockerfile
--cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest
--
GitLab