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

ci

parent 68bb29ef
No related branches found
No related tags found
No related merge requests found
...@@ -3,4 +3,4 @@ RUN apt-get update && \ ...@@ -3,4 +3,4 @@ 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
CMD /bin/bash CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- curl https://caosdb-server:10443
...@@ -52,10 +52,10 @@ stages: ...@@ -52,10 +52,10 @@ stages:
test: test:
tags: [docker] tags: [docker]
#image: image:
# name: docker/compose:1.24.1 name: docker/compose:1.24.1
# entrypoint: ["/bin/sh", "-c"] entrypoint: ["/bin/sh", "-c"]
image: $CI_REGISTRY_IMAGE:latest #image: $CI_REGISTRY_IMAGE:latest
script: script:
- if [[ "$CAOSDB_TAG" == "" ]]; then - if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=latest; CAOSDB_TAG=latest;
...@@ -64,12 +64,10 @@ test: ...@@ -64,12 +64,10 @@ test:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd .docker - cd .docker
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d - CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
#- docker-compose -f tester.yml run tester - docker-compose -f tester.yml run tester
#- rc=$? - rc=$?
#- docker-compose down - docker-compose down
#- exit $rc - exit $rc
- dip=`docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' docker_caosdb-server_1`
- ./wait-for-it.sh $dip:10443 -t 120 -- curl https://$dip:10443
- cd .. - cd ..
build-testenv: build-testenv:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment