diff --git a/t/api-rest/Dockerfile b/t/api-rest/Dockerfile index 36e0a85d39..f3a0db6cbc 100644 --- a/t/api-rest/Dockerfile +++ b/t/api-rest/Dockerfile @@ -1,24 +1,11 @@ # DOCKER_NAME=ngcp-panel-tests-rest-api-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 - -# 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 ngcp-panel at $(date)\n\ -deb https://debian.sipwise.com/debian jessie main\n\ -deb https://debian.sipwise.com/debian jessie-updates main\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 +ENV REFRESHED_AT 2016-01-12 RUN apt-get update RUN apt-get install --assume-yes \ @@ -61,8 +48,8 @@ WORKDIR /home/testuser # % docker run --rm -i -t -v $(pwd)/../..:/code:rw ngcp-panel-tests-rest-api-jessie:latest bash # # Use the existing docker image: -# % docker pull docker1.mgm.sipwise.com/ngcp-panel-tests-rest-api-jessie -# % docker run --rm -i -t -v $(pwd)/../..:/code:rw docker1.mgm.sipwise.com/ngcp-panel-tests-rest-api-jessie:latest bash +# % docker pull docker.mgm.sipwise.com/ngcp-panel-tests-rest-api-jessie +# % docker run --rm -i -t -v $(pwd)/../..:/code:rw docker.mgm.sipwise.com/ngcp-panel-tests-rest-api-jessie:latest bash # # Inside docker: # su - testuser diff --git a/t/selenium/Dockerfile b/t/selenium/Dockerfile index 9d149a33fb..25d6257dca 100644 --- a/t/selenium/Dockerfile +++ b/t/selenium/Dockerfile @@ -1,24 +1,11 @@ # DOCKER_NAME=ngcp-panel-tests-selenium-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 - -# 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 ngcp-panel at $(date)\n\ -deb https://debian.sipwise.com/debian jessie main\n\ -deb https://debian.sipwise.com/debian jessie-updates main\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 +ENV REFRESHED_AT 2016-01-12 RUN apt-get update RUN apt-get install --assume-yes \ @@ -72,8 +59,8 @@ WORKDIR /home/selenium # % docker run --rm -p 5999:5999 -i -t -v $(pwd)/../..:/code:rw ngcp-panel-tests-selenium-jessie:latest bash # # Use the existing docker image: -# % docker pull docker1.mgm.sipwise.com/ngcp-panel-tests-selenium-jessie -# % docker run --rm -p 5999:5999 -i -t -v $(pwd)/../..:/code:rw docker1.mgm.sipwise.com/ngcp-panel-tests-selenium-jessie:latest bash +# % docker pull docker.mgm.sipwise.com/ngcp-panel-tests-selenium-jessie +# % docker run --rm -p 5999:5999 -i -t -v $(pwd)/../..:/code:rw docker.mgm.sipwise.com/ngcp-panel-tests-selenium-jessie:latest bash # # Inside docker: # su - selenium