diff --git a/.gitlab/ci/.mk-docs-deploy.yml b/.gitlab/ci/.mk-docs-deploy.yml index e465f465216e8faae42ee2cd1641ed09b71256e4..2814aea56da8dbaac0f57154253e3ba63e5cd2ea 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 4df26553aeea1d1148c940fb0a4c343c95c6c972..a4f8cb9b0326b6200aa034c4801408eea551a07d 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 398dc23946a6853b8bc3777476895d817fb2472d..978d84ce46d72bac716f4d4dbb6c057e1aea5cda 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 92237ccb64354b7f5f13373024ac038b336ce4c0..6448d49d22ee5bcfdbfe0b7543b125457c93023c 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 4a930d69512e62668991045565d62b4077f9d286..827ec93033117838e9538899dcd9ab6d746c062d 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