From 8af7f0d037d70ef7d5835831bd7dea4be3aa1ee6 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Sun, 5 Jul 2020 07:31:12 +0000 Subject: [PATCH] Updated Dockerfiles to use ReleaseEIGHT-daily repo by default Change-Id: I0dd48e273a3a12553062418f1da0d60f33bb23b2 Signed-off-by: garciadeblas --- docker/LCM/Dockerfile | 2 +- docker/MON/Dockerfile | 2 +- docker/NBI/Dockerfile | 2 +- docker/NG-UI/Dockerfile | 2 +- docker/PLA/Dockerfile | 2 +- docker/POL/Dockerfile | 2 +- docker/RO/Dockerfile | 2 +- docker/light-ui/Dockerfile | 2 +- docker/mk/Makefile.include | 2 +- docker/mk/get_version.sh | 17 ++++++++++++++++- docker/osmclient/Dockerfile | 2 +- docker/tests/Dockerfile | 4 ++-- 12 files changed, 28 insertions(+), 13 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 301582b7..1d39df60 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -70,7 +70,7 @@ RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz && mv juju /usr/local/bin/juju ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseSEVEN-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index 22451fcc..702ff083 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -45,7 +45,7 @@ RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \ 'paramiko' # PyNaCl ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index 5d756b32..f15188d0 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git pyth && mkdir -p /app/storage/kafka && mkdir -p /app/log ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index 0f8febb9..314beff1 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \ && apt-get install -y nginx ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseSEVEN-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing ARG NGUI_VERSION diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile index a686815c..a0af8b87 100644 --- a/docker/PLA/Dockerfile +++ b/docker/PLA/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get --yes update \ && pip3 install pip==9.0.3 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 2dd1382b..43a271ea 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get --yes update \ && pip3 install pip==9.0.3 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 5bc2bbb9..4107b48d 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get -y install curl software-properties-common git tox && python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseSEVEN-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile index 79262d1f..204bfd89 100644 --- a/docker/light-ui/Dockerfile +++ b/docker/light-ui/Dockerfile @@ -20,7 +20,7 @@ RUN ln -s /usr/bin/nodejs /usr/bin/node RUN echo "daemon off;" >> /etc/nginx/nginx.conf ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing ARG LWUI_VERSION diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index b4e63f93..e1517483 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -22,7 +22,7 @@ all: build TAG ?= 6 REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian -RELEASE ?= ReleaseFOUR-daily +RELEASE ?= ReleaseEIGHT-daily REPOSITORY_KEY ?= OSM%20ETSI%20Release%20Key.gpg REPOSITORY ?= testing NO_CACHE ?= --no-cache diff --git a/docker/mk/get_version.sh b/docker/mk/get_version.sh index 7508ac8d..af2036c1 100755 --- a/docker/mk/get_version.sh +++ b/docker/mk/get_version.sh @@ -1,6 +1,21 @@ #!/bin/sh +# +# Copyright 2020 ETSI +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# -RELEASE="ReleaseFOUR-daily" +RELEASE="ReleaseEIGHT-daily" REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg" REPOSITORY="testing" REPOSITORY_BASE="http://osm-download.etsi.org/repository/osm/debian" diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index 49c705ba..ab1a8ac6 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install wget pyt RUN python3 -m pip install -U pip && python3 -m pip install pyyaml python-magic pyangbind pytest==4.6.3 verboselogs ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseSEVEN-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index a7153186..4a8294c3 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -24,7 +24,7 @@ RUN python3 -m pip install haikunator requests robotframework robotframework-sel git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseSEVEN-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing ARG TESTS_VERSION @@ -60,4 +60,4 @@ ENV K8S_CREDENTIALS=/root/.kube/config ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 -ENTRYPOINT [ "/robot-systest/run_test.sh"] \ No newline at end of file +ENTRYPOINT [ "/robot-systest/run_test.sh"] -- 2.25.1