projects / osm / devops.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 356efdd)
Fix bug 1634 - Pinning packages to major version 06/11106/1
authorsousaedu <eduardo.sousa@canonical.com>
Thu, 12 Aug 2021 14:35:51 +0000 (15:35 +0100)
committersousaedu <eduardo.sousa@canonical.com>
Thu, 12 Aug 2021 14:47:26 +0000 (16:47 +0200)
Change-Id: Iea7fd8ebfd7de5033a2ff0197a1a5f1bc53f48b4
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
docker/LCM/Dockerfile patch | blob | history
docker/MON/Dockerfile patch | blob | history
docker/NBI/Dockerfile patch | blob | history
docker/NG-UI/Dockerfile patch | blob | history
docker/PLA/Dockerfile patch | blob | history
docker/POL/Dockerfile patch | blob | history
docker/RO/Dockerfile patch | blob | history
docker/osmclient/Dockerfile patch | blob | history
docker/tests/Dockerfile patch | blob | history

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index abd437a..2e0b84f 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -20,14 +20,14 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.14 \
-    apt-transport-https=1.6.12ubuntu0.2 \
-    gnupg2=2.2.4-1ubuntu1.4 \
-    openssh-client && \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    apt-transport-https=1.6.* \
+    gnupg2=2.2.* \
+    openssh-client=1:7.* && \
     python3 -m easy_install pip==21.0.1
 
 RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
@@ -66,7 +66,7 @@ RUN pip3 install \
 FROM ubuntu:18.04
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install ca-certificates
 
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index f572748..765324c 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -24,12 +24,12 @@ FROM ubuntu:20.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    curl=7.68.0-1ubuntu2.6 \
-    gcc=4:9.3.0-1ubuntu2 \
-    python3=3.8.2-0ubuntu2 \
-    python3-setuptools=45.2.0-1 \
-    python3-dev=3.8.2-0ubuntu2 \
-    openssh-client=1:8.2p1-4ubuntu0.2 && \
+    curl=7.68.* \
+    gcc=4:9.3.* \
+    python3=3.8.* \
+    python3-setuptools=45.2.* \
+    python3-dev=3.8.* \
+    openssh-client=1:8.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG PYTHON3_OSM_COMMON_URL
@@ -53,7 +53,7 @@ RUN pip3 install \
 FROM ubuntu:20.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.2-0ubuntu2
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.*
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     ca-certificates
diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 7b40d05..0f0866a 100644 (file)
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -20,11 +20,11 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.14 && \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG PYTHON3_OSM_COMMON_URL
@@ -48,7 +48,7 @@ RUN pip3 install \
 FROM ubuntu:18.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index 9ea5d3d..b7ca8f7 100644 (file)
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -17,17 +17,17 @@ FROM ubuntu:18.04
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    apt-transport-https=1.6.12ubuntu0.2 \
-    curl=7.58.0-2ubuntu3.14 \
-    gnupg2=2.2.4-1ubuntu1.4 \
-    nginx=1.14.0-0ubuntu1.9 \
-    software-properties-common=0.96.24.32.14 \
-    xz-utils=5.2.2-1.3
+    apt-transport-https=1.6.* \
+    curl=7.58.* \
+    gnupg2=2.2.* \
+    nginx=1.14.* \
+    software-properties-common=0.96.* \
+    xz-utils=5.2.*
 
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
     echo "deb https://deb.nodesource.com/node_10.x xenial main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
     apt-get update && \
-    apt-get install -y nodejs=10.24.1-1nodesource1
+    apt-get install -y nodejs=10.24.*
 
 ARG OSM_NGUI_URL
 
diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile
index 953678d..ffc3588 100644 (file)
--- a/docker/PLA/Dockerfile
+++ b/docker/PLA/Dockerfile
@@ -17,11 +17,11 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.14 && \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG PYTHON3_OSM_COMMON_URL
@@ -46,7 +46,7 @@ FROM ubuntu:18.04
 LABEL authors="Lars-Göran Magnusson"
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 990d325..d87e845 100644 (file)
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -24,12 +24,12 @@ FROM ubuntu:20.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    curl=7.68.0-1ubuntu2.6 \
-    gcc=4:9.3.0-1ubuntu2 \
-    python3=3.8.2-0ubuntu2 \
-    python3-setuptools=45.2.0-1 \
-    python3-dev=3.8.2-0ubuntu2 \
-    mysql-client-core-8.0=8.0.26-0ubuntu0.20.04.2 && \
+    curl=7.68.* \
+    gcc=4:9.3.* \
+    python3=3.8.* \
+    python3-setuptools=45.2.* \
+    python3-dev=3.8.* \
+    mysql-client-core-8.0=8.0.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG PYTHON3_OSM_COMMON_URL
@@ -48,7 +48,7 @@ RUN pip3 install \
 FROM ubuntu:20.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.2-0ubuntu2
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages  /usr/local/lib/python3.8/dist-packages
diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index fbb191a..8dbba7e 100644 (file)
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -20,13 +20,13 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.14 \
-    genisoimage=9:1.1.11-3ubuntu2 \
-    netbase=5.4 && \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    genisoimage=9:1.1.* \
+    netbase=5.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG PYTHON3_OSM_COMMON_URL
@@ -81,7 +81,7 @@ RUN pip3 install \
 FROM ubuntu:18.04
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 7c46007..e07116f 100644 (file)
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -19,13 +19,13 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.14 \
-    libcurl4-openssl-dev=7.58.0-2ubuntu3.14 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9 && \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    libcurl4-openssl-dev=7.58.* \
+    libssl-dev=1.1.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG PYTHON3_OSMCLIENT_URL
@@ -44,7 +44,7 @@ RUN pip3 install \
 FROM ubuntu:18.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 3bc0ce9..5ae1d3c 100644 (file)
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -19,17 +19,17 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.14 \
-    gettext-base \
-    git=1:2.17.1-1ubuntu0.8 \
-    iputils-ping=3:20161105-1ubuntu3 \
-    jq=1.5+dfsg-2 \
-    libcurl4-openssl-dev=7.58.0-2ubuntu3.14 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9 && \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    gettext-base=0.19.* \
+    git=1:2.17.* \
+    iputils-ping=3:* \
+    jq=1.5* \
+    libcurl4-openssl-dev=7.58.* \
+    libssl-dev=1.1.* && \
     python3 -m easy_install pip==21.0.1
 
 ARG OSM_TESTS_URL