diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 44192be8705bdc2d53fb1521d3758b8b412836d9..603ec470defad37cf94a88dcc32b16e6270de350 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -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 diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 9d4c72e93ce8ca44ad9f7e0213722122e215efcf..81bc32d64e3b920c73107641c4e6ca2ca14012bd 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -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" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5092166ac0504948e0575c56c63ffda57b4d2134..464a1cf53200fceaa96cc8fe7e028487aba53a52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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