diff --git a/.docker/Dockerfile b/.docker/Dockerfile index c240da28f58b537d99eec57e28a27c23d98748fd..19de22f303ccdedbfef8f4be333cf02538c20c8a 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM debian:latest RUN apt-get update && \ - apt-get install docker.io tox curl python3-pip git python-autopep8 -y + apt-get install tox curl python3-pip git python-autopep8 -y RUN pip3 install docker-compose COPY .docker/wait-for-it.sh /wait-for-it.sh RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1054ef611f65d4041fb832ae605a3b669dc797df..38186048f1dc25d050d94a3c2bf762ed58c0af10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,6 @@ test: image: name: docker/compose:1.24.1 entrypoint: ["/bin/sh", "-c"] - #image: $CI_REGISTRY_IMAGE:latest script: - if [[ "$CAOSDB_TAG" == "" ]]; then CAOSDB_TAG=dev-latest;