Skip to content

Commit

Permalink
Change: Update gvm-libs image in prod.Dockerfile and build.Dockerfile (
Browse files Browse the repository at this point in the history
…#1730)

* Change: Update gvm-libs image in prod.Dockerfile and build.Dockerfile

* Update prod.Dockerfile

---------

Co-authored-by: Robert Schardt <[email protected]>
  • Loading branch information
robert-schardt and Robert Schardt authored Sep 27, 2024
1 parent 1a71dac commit 0794956
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .docker/build.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions .docker/prod-oldstable.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions .docker/prod-testing.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
5 changes: 2 additions & 3 deletions .docker/prod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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

0 comments on commit 0794956

Please sign in to comment.