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

ci

parent f670a699
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,6 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \
cd caosdb-pylib && pip3 install .
COPY . /git
RUN rm -r /git/.git && mv /git/.docker/.pycaosdb.ini /git && mv /git/.docker/cert /opt/caosdb/cert
RUN rm -r /git/.git && mv /git/.docker/.pycaosdb.ini /git
WORKDIR /git
CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
......@@ -12,6 +12,10 @@ services:
- sqldb
networks:
- caosnet
volumes:
- type: bind
source: ".docker/cert"
target: /opt/caosdb/cert
ports:
# - "from_outside:from_inside"
- "10443:10443"
......
......@@ -64,7 +64,6 @@ test:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd .docker
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
- docker cp -a docker_caosdb-server_1:/opt/caosdb/cert/ cert
- docker-compose -f tester.yml run tester
- rc=$?
- docker-compose down
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment