From 0794956d181d9e8417ad4888caf7f9d20349c93f Mon Sep 17 00:00:00 2001 From: robert-schardt Date: Fri, 27 Sep 2024 07:25:37 +0200 Subject: [PATCH] Change: Update gvm-libs image in prod.Dockerfile and build.Dockerfile (#1730) * Change: Update gvm-libs image in prod.Dockerfile and build.Dockerfile * Update prod.Dockerfile --------- Co-authored-by: Robert Schardt --- .docker/build.Dockerfile | 2 +- .docker/prod-oldstable.Dockerfile | 4 ++-- .docker/prod-testing.Dockerfile | 4 ++-- .docker/prod.Dockerfile | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.docker/build.Dockerfile b/.docker/build.Dockerfile index eb1e3e1f8..2e11844a9 100644 --- a/.docker/build.Dockerfile +++ b/.docker/build.Dockerfile @@ -1,6 +1,6 @@ ARG VERSION=edge -FROM greenbone/gvm-libs:$VERSION +FROM registry.community.greenbone.net/community/gvm-libs:${VERSION} LABEL deprecated="This image is deprecated and may be removed soon." RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/.docker/prod-oldstable.Dockerfile b/.docker/prod-oldstable.Dockerfile index 41d687e40..39f8130bf 100644 --- a/.docker/prod-oldstable.Dockerfile +++ b/.docker/prod-oldstable.Dockerfile @@ -5,7 +5,7 @@ ARG GVM_LIBS_VERSION=oldstable FROM greenbone/openvas-smb:oldstable-edge AS openvas-smb -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} AS build +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} AS build COPY . /source RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ @@ -41,7 +41,7 @@ COPY --from=openvas-smb /usr/local/lib/ /usr/local/lib/ RUN cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_OLD_SYNC_SCRIPT=OFF -B/build /source RUN DESTDIR=/install cmake --build /build -- install -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} ARG TARGETPLATFORM RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ diff --git a/.docker/prod-testing.Dockerfile b/.docker/prod-testing.Dockerfile index e3e7d59be..ea214ebc2 100644 --- a/.docker/prod-testing.Dockerfile +++ b/.docker/prod-testing.Dockerfile @@ -5,7 +5,7 @@ ARG GVM_LIBS_VERSION=testing-edge FROM greenbone/openvas-smb:testing-edge AS openvas-smb -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} AS build +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} AS build COPY . /source RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ @@ -41,7 +41,7 @@ COPY --from=openvas-smb /usr/local/lib/ /usr/local/lib/ RUN cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_OLD_SYNC_SCRIPT=OFF -B/build /source RUN DESTDIR=/install cmake --build /build -- install -FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} +FROM registry.community.greenbone.net/community/gvm-libs:${GVM_LIBS_VERSION} ARG TARGETPLATFORM RUN apt-get update RUN apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile index 897a97cae..5214c2262 100644 --- a/.docker/prod.Dockerfile +++ b/.docker/prod.Dockerfile @@ -4,14 +4,14 @@ ARG REPOSITORY=greenbone/openvas-scanner FROM greenbone/openvas-smb AS openvas-smb -FROM greenbone/gvm-libs:$VERSION AS build +FROM registry.community.greenbone.net/community/gvm-libs:${VERSION} AS build COPY . /source RUN sh /source/.github/install-openvas-dependencies.sh COPY --from=openvas-smb /usr/local/lib/ /usr/local/lib/ RUN cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_OLD_SYNC_SCRIPT=OFF -B/build /source RUN DESTDIR=/install cmake --build /build -- install -FROM greenbone/gvm-libs:$VERSION +FROM registry.community.greenbone.net/community/gvm-libs:${VERSION} ARG TARGETPLATFORM RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ bison \ @@ -58,4 +58,3 @@ RUN setcap cap_net_raw,cap_net_admin+eip /usr/local/sbin/openvas ENV NMAP_PRIVILEGED=1 RUN setcap cap_net_raw,cap_net_admin,cap_net_bind_service+eip /usr/bin/nmap CMD /usr/local/bin/openvasd -