From 137665ce87edf12254ed5c0e94ff71d7a434296e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 24 Jul 2019 13:03:01 +0200
Subject: [PATCH] MAINT: remove unnecessary dependency and old comment
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index c240da2..19de22f 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 1054ef6..3818604 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;
--
GitLab