Skip to content
Snippets Groups Projects
Commit 3a4385c2 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

ci

parent fb505e90
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.docker/Dockerfile
+ 4
− 2
View file @ 3a4385c2
...@@ -3,5 +3,7 @@ RUN apt-get update && \ ...@@ -3,5 +3,7 @@ RUN apt-get update && \
apt-get install docker.io tox curl python3-pip -y apt-get install docker.io tox curl python3-pip -y
RUN pip3 install docker-compose RUN pip3 install docker-compose
COPY wait-for-it.sh /wait-for-it.sh COPY wait-for-it.sh /wait-for-it.sh
COPY ../tests /tests COPY . /git
CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox /tests RUN rm -r /git/.git
WORKDIR /git
CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
.gitlab-ci.yml
+ 1
− 2
View file @ 3a4385c2
...@@ -78,10 +78,9 @@ build-testenv: ...@@ -78,10 +78,9 @@ build-testenv:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest... # use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE:latest || true - docker pull $CI_REGISTRY_IMAGE:latest || true
- cd .docker
- docker build - docker build
--pull --pull
--file Dockerfile --file .docker/Dockerfile
--cache-from $CI_REGISTRY_IMAGE:latest --cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest . -t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:latest
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment