Skip to content

Commit

Permalink
Update docker files to use Debian bookworm (#23543)
Browse files Browse the repository at this point in the history
## 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.
  • Loading branch information
CraigMacomber authored Jan 15, 2025
1 parent 7931866 commit e9b69c7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion server/gitrest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the MIT License.
# DisableDockerDetector "No feasible secure solution for OSS repos yet"

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

ARG SETVERSION_VERSION=dev
ENV SETVERSION_VERSION=$SETVERSION_VERSION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,9 @@ testFileSystems.forEach((fileSystem) => {
);
// Tests run against commit 7620034bac63c5e3c4cb85f666a41c46012e8a49 on Dec 13, 2023
// showed that the final storage size was 13kb, or 23kb for low-io mode where summary blobs are not shared.
// When updating docker base image, a size of 24kb was observed.
const finalStorageSizeKb = Math.ceil((await fsCheckSizeBytes()) / 1_024);
const expectedMaxStorageSizeKb = testMode.enableLowIoWrite ? 23 : 13;
const expectedMaxStorageSizeKb = testMode.enableLowIoWrite ? 24 : 13;
process.stdout.write(
`Final storage size: ${finalStorageSizeKb}kb; expected: ${expectedMaxStorageSizeKb}\n`,
);
Expand Down
2 changes: 1 addition & 1 deletion server/historian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

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

# node-gyp dependencies
RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion server/routerlicious/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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

# node-gyp dependencies
RUN apt-get update && apt-get install -y \
Expand Down

0 comments on commit e9b69c7

Please sign in to comment.