From 6ea6a0651826aaec39460f7664445e39a96252df Mon Sep 17 00:00:00 2001 From: Manuel Montecelo Date: Mon, 3 May 2021 19:04:47 +0200 Subject: [PATCH] TT#118659 Switch Dockerfiles from Debian buster to bullseye Change-Id: Id3c861ab34259fc9073d86454f3a3cb62c314df2 --- t/Dockerfile | 16 ++++++++-------- t/selenium/Dockerfile | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/t/Dockerfile b/t/Dockerfile index 853115bb..fe5d080d 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -1,11 +1,11 @@ -# DOCKER_NAME=ngcp-csc-ui-buster -FROM docker.mgm.sipwise.com/sipwise-buster:latest +# DOCKER_NAME=ngcp-csc-ui-bullseye +FROM docker.mgm.sipwise.com/sipwise-bullseye: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 2020-09-16 +ENV REFRESHED_AT 2021-05-03 ENV DEBIAN_FRONTEND noninteractive ENV DISPLAY=:0 @@ -36,16 +36,16 @@ WORKDIR /code # # 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-buster main" > t/sources.list.d/builddeps.list +# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-bullseye main" > t/sources.list.d/builddeps.list # # NOTE: run the following command from root folder of git repository: -# % docker build --tag="ngcp-csc-ui-buster" -f ./t/Dockerfile . -# % docker run --rm -i -t -v $(pwd):/code:ro ngcp-csc-ui-buster:latest bash +# % docker build --tag="ngcp-csc-ui-bullseye" -f ./t/Dockerfile . +# % docker run --rm -i -t -v $(pwd):/code:ro ngcp-csc-ui-bullseye:latest bash # # Use the existing docker image: -# % docker pull docker.mgm.sipwise.com/ngcp-csc-ui-buster +# % docker pull docker.mgm.sipwise.com/ngcp-csc-ui-bullseye # NOTE: run the following command from root folder of git repository: -# % docker run --rm -i -t -v $(pwd):/code:ro -v /results docker.mgm.sipwise.com/ngcp-csc-ui-buster:latest bash +# % docker run --rm -i -t -v $(pwd):/code:ro -v /results docker.mgm.sipwise.com/ngcp-csc-ui-bullseye:latest bash # # Inside docker: # cd /code && ./t/testrunner diff --git a/t/selenium/Dockerfile b/t/selenium/Dockerfile index bf9a0539..c88da2c2 100644 --- a/t/selenium/Dockerfile +++ b/t/selenium/Dockerfile @@ -1,11 +1,11 @@ -# DOCKER_NAME=ngcp-csc-ui-selenium-test-buster -FROM docker.mgm.sipwise.com/sipwise-buster:latest +# DOCKER_NAME=ngcp-csc-ui-selenium-test-bullseye +FROM docker.mgm.sipwise.com/sipwise-bullseye: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 2019-11-21 +ENV REFRESHED_AT 2021-05-03 RUN apt-get update RUN apt-get install --assume-yes \ @@ -62,12 +62,12 @@ COPY t/selenium/jenkins_docker_run /home/selenium/ # ---------------------- # When you want to build the base image from scratch (jump to the next section if you don't want to build yourself!): # NOTE: run the following command from root folder of git repository: -# % docker build --tag="ngcp-csc-ui-selenium-test-buster" -f t/selenium/Dockerfile . -# % docker run --rm -p 5999:5999 --shm-size 4g -i -t -v ~/Dokumente/ngcp-csc-ui:/code:rw ngcp-csc-ui-selenium-test-buster bash +# % docker build --tag="ngcp-csc-ui-selenium-test-bullseye" -f t/selenium/Dockerfile . +# % docker run --rm -p 5999:5999 --shm-size 4g -i -t -v ~/Dokumente/ngcp-csc-ui:/code:rw ngcp-csc-ui-selenium-test-bullseye bash # # Use the existing docker image: -# % docker pull docker.mgm.sipwise.com/ngcp-csc-ui-selenium-test-buster -# % docker run --rm -p 5999:5999 --shm-size 4g -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/ngcp-csc-ui-selenium-test-buster:latest bash +# % docker pull docker.mgm.sipwise.com/ngcp-csc-ui-selenium-test-bullseye +# % docker run --rm -p 5999:5999 --shm-size 4g -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/ngcp-csc-ui-selenium-test-bullseye:latest bash # # Inside docker: # su - selenium