diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 3dd4b6b0c462d04218e913d683e88a26f1400189..14a4f121954591a255cbb32301f3bad748771f74 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -9,7 +9,6 @@ RUN apt-get update && \ tox \ -y COPY .docker/wait-for-it.sh /wait-for-it.sh -ARG PYLIB=dev ADD https://gitlab.indiscale.com/api/v4/projects/97/repository/commits/${PYLIB} \ pylib_version.json RUN git clone https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git && \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0d0982745ac95edadccfef823ac0931c6a5e39e..369576142f716feb3677c4f158a7ea0543f8d318 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,7 +124,7 @@ test: SERVICE_PORT_2376_TCP_PORT: 2375 stage: test image: $CI_REGISTRY_IMAGE_BASE - needs: ["cert"] + needs: [cert] script: - *env - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY @@ -210,6 +210,9 @@ cert: tags: [docker] stage: cert image: $CI_REGISTRY_IMAGE + needs: + - job: build-testenv + optional: true artifacts: paths: - .docker/cert/ @@ -222,7 +225,9 @@ style: tags: [docker] stage: style image: $CI_REGISTRY_IMAGE - needs: [] + needs: + - job: build-testenv + optional: true script: - autopep8 -r --diff --exit-code . allow_failure: true