From 5f2b5aff0f7c1b346a74d14ebe1b6cc137047273 Mon Sep 17 00:00:00 2001
From: Neil Schark <neil.schark@h-da.de>
Date: Tue, 17 Oct 2023 14:19:14 +0000
Subject: [PATCH] Update debian from bullseye to bookworm
See merge request danet/gosdn!571
Co-authored-by: Neil-Jocelyn Schark <--global>
---
.gitlab/ci/.mk-docs-deploy.yml | 4 ++--
applications/venv-manager/venv-manager.Dockerfile | 2 +-
controller/controller.Dockerfile | 4 ++--
plugin-registry/plugin-registry.Dockerfile | 2 +-
plugin-registry/plugin-registry.debug.Dockerfile | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab/ci/.mk-docs-deploy.yml b/.gitlab/ci/.mk-docs-deploy.yml
index e465f4652..2814aea56 100644
--- a/.gitlab/ci/.mk-docs-deploy.yml
+++ b/.gitlab/ci/.mk-docs-deploy.yml
@@ -1,5 +1,5 @@
build-mkdocs:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python:3.11.5-slim-bullseye
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python:3.11.5-slim-bookworm
stage: build
before_script:
- pip install mkdocs-material
@@ -13,7 +13,7 @@ build-mkdocs:
- if: $CI_COMMIT_REF_PROTECTED == "true"
.pages-options: &pages-options
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python:3.11.5-slim-bullseye
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python:3.11.5-slim-bookworm
stage: deploy
script:
- mv mkdocs-built public
diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile
index 4df26553a..a4f8cb9b0 100644
--- a/applications/venv-manager/venv-manager.Dockerfile
+++ b/applications/venv-manager/venv-manager.Dockerfile
@@ -2,7 +2,7 @@ ARG GOLANG_VERSION=1.21
ARG BUILDARGS
ARG $GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers
-FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye AS builder
+FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm AS builder
WORKDIR /gosdn
diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile
index 398dc2394..978d84ce4 100644
--- a/controller/controller.Dockerfile
+++ b/controller/controller.Dockerfile
@@ -2,14 +2,14 @@ ARG GOLANG_VERSION=1.21
ARG BUILDARGS
ARG $GITLAB_PROXY
-FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder
+FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder
WORKDIR /gosdn/
COPY . .
RUN --mount=type=cache,target=/root/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
make build-gosdn
-FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye
+FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm
WORKDIR /app/
COPY --from=builder /gosdn/controller/configs/development-gosdn.toml.example ./configs/development-gosdn.toml
COPY --from=builder /gosdn/controller/configs/containerlab-gosdn.toml.example ./configs/containerlab-gosdn.toml
diff --git a/plugin-registry/plugin-registry.Dockerfile b/plugin-registry/plugin-registry.Dockerfile
index 92237ccb6..6448d49d2 100644
--- a/plugin-registry/plugin-registry.Dockerfile
+++ b/plugin-registry/plugin-registry.Dockerfile
@@ -2,7 +2,7 @@ ARG GOLANG_VERSION=1.21
ARG BUILDARGS
ARG $GITLAB_PROXY
-FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder
+FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder
WORKDIR /plugin-registry/
RUN apt-get update
RUN apt-get -y install --no-install-recommends zip
diff --git a/plugin-registry/plugin-registry.debug.Dockerfile b/plugin-registry/plugin-registry.debug.Dockerfile
index 4a930d695..827ec9303 100644
--- a/plugin-registry/plugin-registry.debug.Dockerfile
+++ b/plugin-registry/plugin-registry.debug.Dockerfile
@@ -2,7 +2,7 @@ ARG GOLANG_VERSION=1.21
ARG BUILDARGS
ARG $GITLAB_PROXY
-FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bullseye as builder
+FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder
WORKDIR /plugin-registry/
RUN apt-get update
RUN apt-get -y install --no-install-recommends zip
--
GitLab