From 94c66cbc97eb93858c4d8853dce380126bbe96aa Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Fri, 26 Sep 2025 09:29:25 +0200 Subject: [PATCH] Pull docker images through nexus proxy Issue-ID: MULTICLOUD-1514 Change-Id: I2ec465b04609e11cfff924116737fdcdb44a49b4 Signed-off-by: Fiete Ostkamp --- build/Dockerfile | 2 +- deployments/build.sh | 2 +- kud/build/Dockerfile | 2 +- kud/deployment_infra/installers/Dockerfile.iavf-driver-installer | 2 +- kud/deployment_infra/installers/Dockerfile.qat-driver-installer | 2 +- kud/tests/cFW/firewall/Dockerfile | 2 +- kud/tests/cFW/packetgen/Dockerfile | 2 +- kud/tests/cFW/sink/Dockerfile | 2 +- kud/tests/cFW/vpp/Dockerfile | 2 +- kud/tests/generic_simulator/Dockerfile | 2 +- kud/tests/sdwan/build/Dockerfile_1806_mwan3.tpl | 2 +- kud/tests/sdwan/build/Dockerfile_1806_mwan3_noproxy.tpl | 2 +- src/clm/scripts/Dockerfile | 2 +- src/monitor/build/Dockerfile | 5 ++--- src/ncm/scripts/Dockerfile | 2 +- src/orchestrator/scripts/Dockerfile | 4 ++-- src/ovnaction/scripts/Dockerfile | 2 +- src/rsync/scripts/Dockerfile | 2 +- src/tools/emcoui/Dockerfile | 4 ++-- src/tools/emcoui/middle_end/Dockerfile | 6 +++--- 20 files changed, 25 insertions(+), 26 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 23787735..fa54a0b3 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -18,7 +18,7 @@ RUN cd src/rsync && make all RUN cd src/ovnaction && make all RUN cd src/clm && make all -FROM ubuntu:16.04 +FROM nexus3.onap.org:10001/ubuntu:16.04 WORKDIR /opt/emco RUN groupadd -r emco && useradd -r -g emco emco diff --git a/deployments/build.sh b/deployments/build.sh index b1e0771a..be7681c8 100755 --- a/deployments/build.sh +++ b/deployments/build.sh @@ -23,7 +23,7 @@ function _compile_src { pushd $k8s_path/src/k8splugin/ pwd # mount directory and build in container (thus not relying on the state of the runner) - docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp golang:1.14 make + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp nexus3.onap.org:10001/golang:1.14.1 make popd } diff --git a/kud/build/Dockerfile b/kud/build/Dockerfile index 72c46f73..9b6da306 100644 --- a/kud/build/Dockerfile +++ b/kud/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 as base +FROM nexus3.onap.org:10001/ubuntu:18.04 as base ARG KUD_ENABLE_TESTS=false ARG KUD_PLUGIN_ENABLED=false ARG CONTAINER_RUNTIME=docker diff --git a/kud/deployment_infra/installers/Dockerfile.iavf-driver-installer b/kud/deployment_infra/installers/Dockerfile.iavf-driver-installer index 8d4593a6..ea559d1b 100644 --- a/kud/deployment_infra/installers/Dockerfile.iavf-driver-installer +++ b/kud/deployment_infra/installers/Dockerfile.iavf-driver-installer @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ENV IAVF_DRIVER_VERSION=4.0.2 ENV IAVF_DRIVER_DOWNLOAD_URL=https://downloadmirror.intel.com/30305/eng/iavf-${IAVF_DRIVER_VERSION}.tar.gz diff --git a/kud/deployment_infra/installers/Dockerfile.qat-driver-installer b/kud/deployment_infra/installers/Dockerfile.qat-driver-installer index b85d0e23..5088cf33 100644 --- a/kud/deployment_infra/installers/Dockerfile.qat-driver-installer +++ b/kud/deployment_infra/installers/Dockerfile.qat-driver-installer @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ENV QAT_DRIVER_VERSION=1.7.l.4.12.0-00011 ENV QAT_DRIVER_DOWNLOAD_URL=https://01.org/sites/default/files/downloads/qat${QAT_DRIVER_VERSION}.tar.gz diff --git a/kud/tests/cFW/firewall/Dockerfile b/kud/tests/cFW/firewall/Dockerfile index 086f30ce..60b75b1f 100644 --- a/kud/tests/cFW/firewall/Dockerfile +++ b/kud/tests/cFW/firewall/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 as builder +FROM nexus3.onap.org:10001/ubuntu:18.04 as builder MAINTAINER Victor Morales ENV demo_artifacts_version "1.6.0" diff --git a/kud/tests/cFW/packetgen/Dockerfile b/kud/tests/cFW/packetgen/Dockerfile index 074fec02..995d4664 100644 --- a/kud/tests/cFW/packetgen/Dockerfile +++ b/kud/tests/cFW/packetgen/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 as builder +FROM nexus3.onap.org:10001/ubuntu:18.04 as builder MAINTAINER Victor Morales ENV demo_artifacts_version "1.6.0" diff --git a/kud/tests/cFW/sink/Dockerfile b/kud/tests/cFW/sink/Dockerfile index 3d934135..e66f747e 100644 --- a/kud/tests/cFW/sink/Dockerfile +++ b/kud/tests/cFW/sink/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 MAINTAINER Ritu Sood COPY init.sh /opt/init.sh diff --git a/kud/tests/cFW/vpp/Dockerfile b/kud/tests/cFW/vpp/Dockerfile index a04e0236..e2ec9e24 100644 --- a/kud/tests/cFW/vpp/Dockerfile +++ b/kud/tests/cFW/vpp/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 MAINTAINER Victor Morales ENV VERSION "19.01.2-release" diff --git a/kud/tests/generic_simulator/Dockerfile b/kud/tests/generic_simulator/Dockerfile index 202cafc6..38d4c31b 100644 --- a/kud/tests/generic_simulator/Dockerfile +++ b/kud/tests/generic_simulator/Dockerfile @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM python:2.7 +FROM nexus3.onap.org:10001/python:2.7 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} diff --git a/kud/tests/sdwan/build/Dockerfile_1806_mwan3.tpl b/kud/tests/sdwan/build/Dockerfile_1806_mwan3.tpl index 85c7d358..e094196a 100644 --- a/kud/tests/sdwan/build/Dockerfile_1806_mwan3.tpl +++ b/kud/tests/sdwan/build/Dockerfile_1806_mwan3.tpl @@ -1,4 +1,4 @@ -FROM openwrt-1806-4-base +FROM nexus3.onap.org:10001/openwrt-1806-4-base #EXPOSE 80 ENV http_proxy={docker_proxy} diff --git a/kud/tests/sdwan/build/Dockerfile_1806_mwan3_noproxy.tpl b/kud/tests/sdwan/build/Dockerfile_1806_mwan3_noproxy.tpl index 8b5c57d2..0f91b731 100644 --- a/kud/tests/sdwan/build/Dockerfile_1806_mwan3_noproxy.tpl +++ b/kud/tests/sdwan/build/Dockerfile_1806_mwan3_noproxy.tpl @@ -1,4 +1,4 @@ -FROM openwrt-1806-4-base +FROM nexus3.onap.org:10001/openwrt-1806-4-base #EXPOSE 80 diff --git a/src/clm/scripts/Dockerfile b/src/clm/scripts/Dockerfile index 87dc1359..9ce7d6a0 100644 --- a/src/clm/scripts/Dockerfile +++ b/src/clm/scripts/Dockerfile @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} diff --git a/src/monitor/build/Dockerfile b/src/monitor/build/Dockerfile index 9ecff169..faac2e5a 100644 --- a/src/monitor/build/Dockerfile +++ b/src/monitor/build/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.14.1 +FROM nexus3.onap.org:10001/golang:1.14.1 WORKDIR /go/src/github.com/onap/multicloud-k8s/src/monitor COPY ./ ./ RUN make all -FROM ubuntu:16.04 +FROM nexus3.onap.org:10001/ubuntu:16.04 WORKDIR /opt/monitor RUN groupadd -r monitor && useradd -r -g monitor monitor @@ -13,4 +13,3 @@ COPY --chown=monitor --from=0 /go/src/github.com/onap/multicloud-k8s/src/monitor USER monitor ENTRYPOINT ["/opt/monitor/monitor"] - diff --git a/src/ncm/scripts/Dockerfile b/src/ncm/scripts/Dockerfile index d1b58677..a98307c8 100644 --- a/src/ncm/scripts/Dockerfile +++ b/src/ncm/scripts/Dockerfile @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} diff --git a/src/orchestrator/scripts/Dockerfile b/src/orchestrator/scripts/Dockerfile index b894f47c..e2ac7bf7 100644 --- a/src/orchestrator/scripts/Dockerfile +++ b/src/orchestrator/scripts/Dockerfile @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -27,4 +27,4 @@ ADD --chown=onap ./orchestrator ./ USER onap -CMD ["./orchestrator"] \ No newline at end of file +CMD ["./orchestrator"] diff --git a/src/ovnaction/scripts/Dockerfile b/src/ovnaction/scripts/Dockerfile index a9d4d467..74392be5 100644 --- a/src/ovnaction/scripts/Dockerfile +++ b/src/ovnaction/scripts/Dockerfile @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} diff --git a/src/rsync/scripts/Dockerfile b/src/rsync/scripts/Dockerfile index 99df6cd9..36e2e30e 100644 --- a/src/rsync/scripts/Dockerfile +++ b/src/rsync/scripts/Dockerfile @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:18.04 +FROM nexus3.onap.org:10001/ubuntu:18.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} diff --git a/src/tools/emcoui/Dockerfile b/src/tools/emcoui/Dockerfile index 8224d92c..7ed901f4 100644 --- a/src/tools/emcoui/Dockerfile +++ b/src/tools/emcoui/Dockerfile @@ -14,7 +14,7 @@ # ======================================================================== # => Build container -FROM node:alpine as builder +FROM nexus3.onap.org:10001/node:alpine as builder WORKDIR /app COPY package.json . COPY package-lock.json . @@ -25,7 +25,7 @@ COPY public ./public RUN REACT_APP_VERSION=v1.2.0 npm run build # => Run container -FROM nginx:1.15.2-alpine +FROM nexus3.onap.org:10001/nginx:1.15.2-alpine # Nginx config COPY default.conf /etc/nginx/conf.d/ diff --git a/src/tools/emcoui/middle_end/Dockerfile b/src/tools/emcoui/middle_end/Dockerfile index 4e35322c..80284eec 100644 --- a/src/tools/emcoui/middle_end/Dockerfile +++ b/src/tools/emcoui/middle_end/Dockerfile @@ -13,15 +13,15 @@ # limitations under the License. # ======================================================================== -FROM golang:1.14.1 +FROM nexus3.onap.org:10001/golang:1.14.1 # Set the Current Working Directory inside the container WORKDIR /src COPY ./ ./ -RUN make all +RUN make all # Build the Go app -FROM ubuntu:16.04 +FROM nexus3.onap.org:10001/ubuntu:16.04 WORKDIR /opt/emco RUN groupadd -r emco && useradd -r -g emco emco RUN chown emco:emco /opt/emco -R -- 2.16.6