diff --git a/t/Dockerfile b/t/Dockerfile index c44f321..ee35e35 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -5,10 +5,11 @@ FROM docker.mgm.sipwise.com/sipwise-jessie:latest # 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-12 +ENV REFRESHED_AT 2017-06-30 -# TODO - the release-trunk-jessie is too dynamic yet, though required for some build/test dependencies -RUN echo "deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main" >>/etc/apt/sources.list +# files that get-code generates +COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/ +COPY t/sources.list.d/preferences /etc/apt/preferences.d/ RUN apt-get update RUN apt-get install --assume-yes perl libstrictures-perl libboolean-perl libclone-perl \ @@ -25,13 +26,22 @@ WORKDIR /code/ ################################################################################ # Instructions for usage # ---------------------- -# When you want to build the base image from scratch (jump to the next section if you don't want to build yourself!): -# % docker build --tag="data-hal-jessie" . -# % docker run --rm -i -t -v $(pwd)/..:/code:rw data-hal-jessie:latest bash +# When you want to build the base image from scratch +# (jump to the next section if you don't want to build yourself!): +# +# you need to put the proper NGCP sources at t/sources.list.d/builddeps.list +# for instance, trunk: +# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main" > / +# t/sources.list.d/builddeps.list +# +# NOTE: run the following command from root folder of git repository: +# % docker build --tag="data-hal-jessie" -f t/Dockerfile . +# % docker run --rm -i -t -v $(pwd):/code:rw data-hal-jessie:latest bash # # Use the existing docker image: # % 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 +# NOTE: run the following command from root folder of git repository: +# % 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 diff --git a/t/sources.list.d/builddeps.list b/t/sources.list.d/builddeps.list new file mode 100644 index 0000000..e69de29 diff --git a/t/sources.list.d/preferences b/t/sources.list.d/preferences new file mode 100644 index 0000000..e69de29