From 681dd27c65be99677e1f6338e00c7078e73ed28e Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 10 May 2017 14:08:15 -0400 Subject: [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 --- testing/docker/Dockerfile | 6 ++++-- 1 file 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" -- cgit v1.2.3