From b4613cf81a1e9d1523aa8c2b6ccd4c2afeb51262 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Thu, 15 Jun 2023 10:52:02 +0200 Subject: [PATCH 1/3] Change: Use gvm-libs:oldstable images The oldstable tag of gvm-libs is used for compatibility of the debian package dependencies. (cherry picked from commit 2707a7baf72d3bd791dfed61aec6a2c4599eb53e) # Conflicts: # .docker/prod.Dockerfile --- .docker/build.Dockerfile | 2 +- .docker/prod.Dockerfile | 5 +++++ .github/workflows/build-container.yml | 2 +- .github/workflows/container.yml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.docker/build.Dockerfile b/.docker/build.Dockerfile index 112d84fd2..e3ad4e154 100644 --- a/.docker/build.Dockerfile +++ b/.docker/build.Dockerfile @@ -1,5 +1,5 @@ # Define ARG we use through the build -ARG VERSION=stable +ARG VERSION=oldstable # We want gvm-libs to be ready so we use the build docker image of gvm-libs FROM greenbone/gvm-libs:$VERSION diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile index 3e312853f..21f3cae05 100644 --- a/.docker/prod.Dockerfile +++ b/.docker/prod.Dockerfile @@ -1,4 +1,9 @@ +<<<<<<< HEAD ARG VERSION=stable +======= +ARG VERSION=edge +ARG GVM_LIBS_VERSION=oldstable +>>>>>>> 2707a7baf (Change: Use gvm-libs:oldstable images) ARG DEBIAN_FRONTEND=noninteractive FROM greenbone/gvmd-build:${VERSION} as builder diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 808dfd75a..cae312e1b 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -32,7 +32,7 @@ jobs: images: ${{ github.repository }}-build labels: | org.opencontainers.image.vendor=Greenbone - org.opencontainers.image.base.name=debian/stable-slim + org.opencontainers.image.base.name=greenbone/gvm-libs flavor: latest=false # no latest container tag for git tags tags: | # create container tag for git tags diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index f0543cfe5..4f6c58961 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -23,7 +23,7 @@ jobs: images: ${{ github.repository }} labels: | org.opencontainers.image.vendor=Greenbone - org.opencontainers.image.base.name=debian/stable-slim + org.opencontainers.image.base.name=greenbone/gvm-libs flavor: latest=false # no latest container tag for git tags tags: | # use container tag for git tags From 7da028bb7d8dc7d15da4c0edf4bc258ad2e1d9d9 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 26 Jun 2023 17:27:19 +0200 Subject: [PATCH 2/3] Update prod.Dockerfile --- .docker/prod.Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile index 21f3cae05..83f7eb3ba 100644 --- a/.docker/prod.Dockerfile +++ b/.docker/prod.Dockerfile @@ -1,9 +1,5 @@ -<<<<<<< HEAD -ARG VERSION=stable -======= ARG VERSION=edge ARG GVM_LIBS_VERSION=oldstable ->>>>>>> 2707a7baf (Change: Use gvm-libs:oldstable images) ARG DEBIAN_FRONTEND=noninteractive FROM greenbone/gvmd-build:${VERSION} as builder From 9eac27ac2ad53b1905cecb556402593587df9267 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 26 Jun 2023 17:30:39 +0200 Subject: [PATCH 3/3] Update prod.Dockerfile --- .docker/prod.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile index 83f7eb3ba..375062b76 100644 --- a/.docker/prod.Dockerfile +++ b/.docker/prod.Dockerfile @@ -13,7 +13,7 @@ RUN mkdir /build && \ cmake -DCMAKE_BUILD_TYPE=Release /source && \ make DESTDIR=/install install -FROM greenbone/gvm-libs:${VERSION} +FROM greenbone/gvm-libs:${GVM_LIBS_VERSION} ARG DEBIAN_FRONTEND=noninteractive