From 95004c8a02d1b5801bd95048c6a0f1f38c5cb311 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 12 Jan 2016 15:10:11 +0100 Subject: [PATCH] MT#17029 Switch Dockerfile to use a sipwise-jessie image This way we get a Debian Jessie system with Sipwise mirrors and need not do any additional setup. Change-Id: I8de74afcb6e38fdd7da002addde31c419d8fc0f8 --- t/Dockerfile | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/t/Dockerfile b/t/Dockerfile index 5d96859..c44f321 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -1,23 +1,14 @@ # DOCKER_NAME=data-hal-jessie -# TODO - switch to sipwise internal one -FROM debian:jessie +FROM docker.mgm.sipwise.com/sipwise-jessie:latest # Important! Update this no-op ENV variable when this Dockerfile # is updated with the current date. It will force refresh of all # of the base images and things like `apt-get update` won't be using # old cached versions when the Dockerfile is built. -ENV REFRESHED_AT 2016-01-08 +ENV REFRESHED_AT 2016-01-12 -# mirrors behind httpredir randomly throw `Error reading from server. Remote end closed connection` -# and we want to be independent from any external services anyway # TODO - the release-trunk-jessie is too dynamic yet, though required for some build/test dependencies -RUN apt-get update && apt-get -y install apt-transport-https wget -RUN echo "# generated by Dockerfile from data-hal at $(date)\n\ -deb https://debian.sipwise.com/debian jessie main non-free\n\ -deb https://debian.sipwise.com/debian jessie-updates main non-free\n\ -deb https://debian-security.sipwise.com/debian-security jessie-security main contrib non-free\n\ -deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main\n" > /etc/apt/sources.list -RUN wget -O /etc/apt/trusted.gpg.d/sipwise.gpg https://deb.sipwise.com/spce/sipwise.gpg +RUN echo "deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main" >>/etc/apt/sources.list RUN apt-get update RUN apt-get install --assume-yes perl libstrictures-perl libboolean-perl libclone-perl \ @@ -39,8 +30,8 @@ WORKDIR /code/ # % docker run --rm -i -t -v $(pwd)/..:/code:rw data-hal-jessie:latest bash # # Use the existing docker image: -# % docker pull docker1.mgm.sipwise.com/data-hal-jessie -# % docker run --rm -i -t -v $(pwd)/..:/code:rw docker1.mgm.sipwise.com/data-hal-jessie:latest bash +# % docker pull docker.mgm.sipwise.com/data-hal-jessie +# % docker run --rm -i -t -v $(pwd)/..:/code:rw docker.mgm.sipwise.com/data-hal-jessie:latest bash # # Inside docker (the command is in history, just press UP button): # ./t/testrunner