summaryrefslogtreecommitdiff
path: root/testing/docker
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-05-10 14:08:15 -0400
committerMicah Anderson <micah@riseup.net>2017-05-10 14:17:35 -0400
commit681dd27c65be99677e1f6338e00c7078e73ed28e (patch)
tree7b3a39a7e5181578e54c00a58b87f0c91e52f1c1 /testing/docker
parent95f378a45ac3bb18a4589d1706685bb525b216d7 (diff)
[bug] fix docker image generation
The image location needs to be changed to the new location and the docker.io package needs to be available in the image to build it
Diffstat (limited to 'testing/docker')
-rw-r--r--testing/docker/Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/testing/docker/Dockerfile b/testing/docker/Dockerfile
index 3a1f8bcf..2dea3ec8 100644
--- a/testing/docker/Dockerfile
+++ b/testing/docker/Dockerfile
@@ -1,6 +1,6 @@
# start with a fresh debian image
# we use backports because of libsqlcipher-dev
-FROM 0xacab.org:4567/leap/gitlab-buildpackage:jessie_amd64
+FROM 0xacab.org:4567/leap/docker/debian:jessie_amd64
RUN apt-get update
RUN apt-get -y dist-upgrade
@@ -20,7 +20,9 @@ RUN apt-get -y install --no-install-recommends libpython2.7-dev \
# used to show connection to couchdb during CI
curl \
# needed to build pysqlcipher module
- build-essential
+ build-essential \
+ # needed to build docker images
+ docker.io
# We need git from backports because it has
# the "%cI: committer date, strict ISO 8601 format"