diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index abd437a68bfe1e40611e00e1af197a3ef4095607..2e0b84f59ff492170e1d9a42c96d55f4e3a9f5f4 100644 --- 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 f57274869da8442290197c50ede2e3ef16824fe2..765324c8dbe997e7748230308603ca279f0abe89 100644 --- 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 7b40d05fc7c5da6183da22f42e42f0b89f9f12aa..0f0866a718f851e499cd0b32b5025917b02150fe 100644 --- 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 9ea5d3d09eb535ce2a37e3ce1f810fab52a1ad3e..b7ca8f7b12eb320e0493a75e1a64a292e113b332 100644 --- 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 953678d97b4d5ef3b77dd7240c17dc656ba845fe..ffc3588b3fd247dde416235ac3450b121fbcef33 100644 --- 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 990d325362263bef4d291f7b576afbde3b762fe7..d87e84543f49b7a9a4142433431f930fa2c7e7cb 100644 --- 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 fbb191a8a3c77039d088f9eabc53ecba72213c1c..8dbba7e795b2945849f77dbf9a2d711aa058a03e 100644 --- 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 7c46007666dc3ae15bbcbd2ea89b9e872b02f5b2..e07116fff32a7a69c664deabeaf4489212b23e62 100644 --- 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 3bc0ce94a5e09fdac163e9c0cd756ebf71bcb118..5ae1d3cbc2650f3828de4d8f75968c9e04a56875 100644 --- 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