From ba76af087da419a880970dfe10c1458282c1e850 Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 27 Jun 2024 17:07:08 +0100 Subject: [PATCH 1/2] feat(build): Debian Bookworm base images --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 914ba471d6f1..f46c6b7d56ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,10 +52,10 @@ ARG NODE_VERSION=16 ARG PYTHON_VERSION=3.11 ARG PYTHON_SITE_DIR=/usr/local/lib/python${PYTHON_VERSION}/site-packages -FROM node:${NODE_VERSION} as node -FROM node:${NODE_VERSION}-slim as node-slim -FROM python:${PYTHON_VERSION} as python -FROM python:${PYTHON_VERSION}-slim as python-slim +FROM node:${NODE_VERSION}-bookworm as node +FROM node:${NODE_VERSION}-bookworm-slim as node-slim +FROM python:${PYTHON_VERSION}-bookworm as python +FROM python:${PYTHON_VERSION}-slim-bookworm as python-slim # - Intermediary stages # * build-node From 690449b24785ae68c270a557a79dc6387960a3bc Mon Sep 17 00:00:00 2001 From: Kim Gustyr Date: Thu, 27 Jun 2024 17:09:26 +0100 Subject: [PATCH 2/2] improve docs --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f46c6b7d56ad..eae7e81d28cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,8 +93,8 @@ RUN make install opts='--without dev' # * build-python-private [build-python] FROM build-python AS build-python-private -# Authenticate git with token, install SAML binary dependency, -# private Python dependencies, and integrate private modules +# Authenticate git with token, install private Python dependencies, +# and integrate private modules ARG SAML_REVISION ARG RBAC_REVISION RUN --mount=type=secret,id=github_private_cloud_token \