TT#17502 docker: fix relative path from new context

* update Dockerfile documentation

Change-Id: Ib1c2491118d1fc02cae0ed198fefe06ccd954660
changes/50/13950/4
Victor Seva 8 years ago
parent a09f6838ba
commit 8994522f91

@ -5,7 +5,7 @@ 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-21
# TODO - the release-trunk-jessie is too dynamic yet, though required build deps
RUN echo "deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main" >>/etc/apt/sources.list
@ -15,6 +15,7 @@ RUN apt-get install --assume-yes \
devscripts \
git \
libtap-formatter-junit-perl \
libdata-printer-perl \
lsof \
net-tools \
vim-tiny \
@ -23,7 +24,7 @@ RUN apt-get install --assume-yes \
RUN adduser --disabled-password --gecos="REST-API Testuser" testuser
WORKDIR /tmp/
COPY control /tmp/
COPY t/api-rest/control /tmp/
RUN mk-build-deps /tmp/control
RUN dpkg --force-depends -i /tmp/ngcp-panel-tests-rest-api-build-deps_1.0_all.deb
RUN apt-get --assume-yes -f install
@ -33,9 +34,6 @@ RUN wget http://deb.sipwise.com/files/libtest-pretty-perl_0.31-1~bpo80+1_all.deb
RUN dpkg --force-depends -i libtest-pretty-perl_0.31-1~bpo80+1_all.deb
RUN apt-get --assume-yes -f install
# useful for debugging tests
RUN apt-get -y install libdata-printer-perl
RUN apt-get clean
RUN echo "cd /code && ./t/api-rest/testrunner 1.2.3.4" > /home/testuser/.bash_history
@ -47,12 +45,13 @@ WORKDIR /home/testuser
# 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="ngcp-panel-tests-rest-api-jessie" .
# % docker run --rm -i -t -v $(pwd)/../..:/code:rw ngcp-panel-tests-rest-api-jessie:latest bash
# NOTE: run the following command from root folder of git repository:
# % docker build --tag="ngcp-panel-tests-rest-api-jessie" -f t/api-rest/Dockerfile .
# % docker run --rm -i -t -v $(pwd):/code:rw ngcp-panel-tests-rest-api-jessie:latest bash
#
# Use the existing docker image:
# % 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
# % 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

@ -5,7 +5,7 @@ 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-21
RUN apt-get update
RUN apt-get install --assume-yes \
@ -29,7 +29,7 @@ RUN wget -O selenium-server-standalone-2.47.1.jar http://selenium-release.storag
RUN ln -s selenium-server-standalone-2.47.1.jar selenium-server-standalone.jar
WORKDIR /tmp/
COPY control /tmp/
COPY t/selenium/control /tmp/
RUN mk-build-deps /tmp/control
RUN dpkg --force-depends -i /tmp/ngcp-panel-tests-selenium-build-deps_1.0_all.deb
RUN apt-get --assume-yes -f install
@ -47,7 +47,7 @@ RUN echo "cd /code && ./t/selenium/testrunner 1.2.3.4" >/home/selenium/.bash_his
RUN echo "su - selenium" >/root/.bash_history
EXPOSE 5999
COPY jenkins_docker_run /home/selenium/
COPY t/selenium/jenkins_docker_run /home/selenium/
WORKDIR /home/selenium
@ -55,12 +55,13 @@ WORKDIR /home/selenium
# 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="ngcp-panel-tests-selenium-jessie" .
# % docker run --rm -p 5999:5999 -i -t -v $(pwd)/../..:/code:rw ngcp-panel-tests-selenium-jessie:latest bash
# NOTE: run the following command from root folder of git repository:
# % docker build --tag="ngcp-panel-tests-selenium-jessie" -f t/selenium/Dockerfile .
# % 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 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
# % 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

Loading…
Cancel
Save