Skip to content

Commit e9b69c7

Browse files
Update docker files to use Debian bookworm (#23543)
## Description Update docker files to use Debian bookworm since buster is years out of support and lacks python 3.8 needed by newer node-gyp. - [x] Confirm this fixes pnpm 9 upgrade via #23546 (I had to test this manually since CI got throttled, but the fix was confirmed) - [x] Add this docker images to the CI machine image to avoid downloading it every run.
1 parent 7931866 commit e9b69c7

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

server/gitrest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT License.
33
# DisableDockerDetector "No feasible secure solution for OSS repos yet"
44

5-
FROM node:18.17.1-buster-slim@sha256:cb2a746612c2564d3bd0f871174618337af9d0f4d895df6a623fd7a69ca6e5bd AS runnerbase
5+
FROM node:18.20.5-bookworm-slim@sha256:c4a278056a0f79abf472d912bbf5af6c874126ae450faad9df52069e9ad78335 AS runnerbase
66

77
ARG SETVERSION_VERSION=dev
88
ENV SETVERSION_VERSION=$SETVERSION_VERSION

server/gitrest/packages/gitrest-base/src/test/summaries.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,9 @@ testFileSystems.forEach((fileSystem) => {
357357
);
358358
// Tests run against commit 7620034bac63c5e3c4cb85f666a41c46012e8a49 on Dec 13, 2023
359359
// showed that the final storage size was 13kb, or 23kb for low-io mode where summary blobs are not shared.
360+
// When updating docker base image, a size of 24kb was observed.
360361
const finalStorageSizeKb = Math.ceil((await fsCheckSizeBytes()) / 1_024);
361-
const expectedMaxStorageSizeKb = testMode.enableLowIoWrite ? 23 : 13;
362+
const expectedMaxStorageSizeKb = testMode.enableLowIoWrite ? 24 : 13;
362363
process.stdout.write(
363364
`Final storage size: ${finalStorageSizeKb}kb; expected: ${expectedMaxStorageSizeKb}\n`,
364365
);

server/historian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# DisableDockerDetector "No feasible secure solution for OSS repos yet"
55

6-
FROM node:18.17.1-buster-slim@sha256:cb2a746612c2564d3bd0f871174618337af9d0f4d895df6a623fd7a69ca6e5bd AS base
6+
FROM node:18.20.5-bookworm-slim@sha256:c4a278056a0f79abf472d912bbf5af6c874126ae450faad9df52069e9ad78335 AS base
77

88
# node-gyp dependencies
99
RUN apt-get update && apt-get install -y \

server/routerlicious/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Use a direct sha256 hash to ensure we are always using the same version of the base image.
77
# This avoids throttling issues with Docker Hub by using an image baked into the pipeline build image.
8-
FROM node:18.17.1-buster-slim@sha256:cb2a746612c2564d3bd0f871174618337af9d0f4d895df6a623fd7a69ca6e5bd AS base
8+
FROM node:18.20.5-bookworm-slim@sha256:c4a278056a0f79abf472d912bbf5af6c874126ae450faad9df52069e9ad78335 AS base
99

1010
# node-gyp dependencies
1111
RUN apt-get update && apt-get install -y \

0 commit comments

Comments
 (0)