From 6e13a2fcfcacdf63cfb6e3fdc3c76db78e911290 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 12 Jan 2016 21:53:08 +0100 Subject: [PATCH] MT#17293 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. * we need lua-unit from our repos Change-Id: I08fb9f594f94bed08b1a60d112d676475973a1a6 --- t/Dockerfile | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/t/Dockerfile b/t/Dockerfile index 6199031..048c3a5 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -1,26 +1,16 @@ # DOCKER_NAME=lua-ngcp-kamailio-jenkins -# 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 lua-ngcp-kamailio-jessie 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 +# TODO - the release-trunk-jessie is too dynamic yet, though required for lua-unit backport +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 lua5.1 lua-unit lua-lemock lua-logging +RUN apt-get update && apt-get install --assume-yes lua5.1 lua-unit lua-lemock lua-logging RUN echo './t/testrunner' >>/root/.bash_history @@ -34,8 +24,8 @@ WORKDIR /code/ # % docker run --rm -i -t -v $(pwd)/..:/code:rw lua-ngcp-kamailio-jessie:latest bash # # Use the existing docker image: -# % docker pull docker1.mgm.sipwise.com/lua-ngcp-kamailio-jessie -# % docker run --rm -i -t -v $(pwd)/..:/code:rw docker1.mgm.sipwise.com/lua-ngcp-kamailio-jessie:latest bash +# % docker pull docker.mgm.sipwise.com/lua-ngcp-kamailio-jessie +# % docker run --rm -i -t -v $(pwd)/..:/code:rw docker.mgm.sipwise.com/lua-ngcp-kamailio-jessie:latest bash # # Inside docker (the command is in history, just press UP button): # ./t/testrunner