From ea1ac8f484cafd767039e938b27e3502cea95b53 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Wed, 20 Sep 2023 16:14:18 +0200 Subject: [PATCH 1/7] Update base node image to node:18-bookworm-slim Signed-off-by: Nikolai Thingnes Leira --- .changeset/witty-buttons-admire.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/witty-buttons-admire.md diff --git a/.changeset/witty-buttons-admire.md b/.changeset/witty-buttons-admire.md new file mode 100644 index 0000000000..77d7ab5f82 --- /dev/null +++ b/.changeset/witty-buttons-admire.md @@ -0,0 +1,5 @@ +--- +'example-backend': patch +--- + +Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. Ref Discord thread: https://discord.com/channels/687207715902193673/687235481154617364/1154020909871550525 From 4f2418e0fc333f2c1611fed87bfba5d9e26cf946 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Wed, 20 Sep 2023 16:15:31 +0200 Subject: [PATCH 2/7] Update base node image to node:18-bookworm-slim Signed-off-by: Nikolai Thingnes Leira --- docs/deployment/docker.md | 8 ++++---- docs/local-dev/cli-build-system.md | 2 +- packages/backend/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md index a117d39f9a..4b29ef8a0e 100644 --- a/docs/deployment/docker.md +++ b/docs/deployment/docker.md @@ -54,7 +54,7 @@ Once the host build is complete, we are ready to build our image. The following `Dockerfile` is included when creating a new app with `@backstage/create-app`: ```Dockerfile -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend. RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ @@ -160,7 +160,7 @@ the repo root: ```Dockerfile # Stage 1 - Create yarn install skeleton layer -FROM node:18-bullseye-slim AS packages +FROM node:18-bookworm-slim AS packages WORKDIR /app COPY package.json yarn.lock ./ @@ -173,7 +173,7 @@ COPY plugins plugins RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -exec rm -rf {} \+ # Stage 2 - Install dependencies and build packages -FROM node:18-bullseye-slim AS build +FROM node:18-bookworm-slim AS build # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend. RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ @@ -211,7 +211,7 @@ RUN mkdir packages/backend/dist/skeleton packages/backend/dist/bundle \ && tar xzf packages/backend/dist/bundle.tar.gz -C packages/backend/dist/bundle # Stage 3 - Build the actual backend image and install production dependencies -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend. RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ diff --git a/docs/local-dev/cli-build-system.md b/docs/local-dev/cli-build-system.md index 94244de6fa..06aec945b9 100644 --- a/docs/local-dev/cli-build-system.md +++ b/docs/local-dev/cli-build-system.md @@ -418,7 +418,7 @@ The following is an example of a `Dockerfile` that can be used to package the output of building a package with role `'backend'` into an image: ```Dockerfile -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim WORKDIR /app COPY yarn.lock package.json packages/backend/dist/skeleton.tar.gz ./ diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile index 24ede0e866..11f075d1cc 100644 --- a/packages/backend/Dockerfile +++ b/packages/backend/Dockerfile @@ -9,7 +9,7 @@ # # Once the commands have been run, you can build the image using `yarn build-image` -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim # Install sqlite3 dependencies. You can skip this if you don't use sqlite3 in the image, # in which case you should also move better-sqlite3 to "devDependencies" in package.json. From 739490731484be1a9d9d03dbf03651357ed29a11 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Wed, 20 Sep 2023 16:45:22 +0200 Subject: [PATCH 3/7] Update default-app Dockerfile Signed-off-by: Nikolai Thingnes Leira --- .../templates/default-app/packages/backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/packages/backend/Dockerfile b/packages/create-app/templates/default-app/packages/backend/Dockerfile index 373ee7f40a..18548e9337 100644 --- a/packages/create-app/templates/default-app/packages/backend/Dockerfile +++ b/packages/create-app/templates/default-app/packages/backend/Dockerfile @@ -9,7 +9,7 @@ # # Once the commands have been run, you can build the image using `yarn build-image` -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend. RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ From b665f2ce6572dfd0bc8f5822ff11da50b8e3b0a6 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Wed, 20 Sep 2023 16:48:24 +0200 Subject: [PATCH 4/7] Add changeset Signed-off-by: Nikolai Thingnes Leira --- .changeset/dull-laws-camp.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/dull-laws-camp.md diff --git a/.changeset/dull-laws-camp.md b/.changeset/dull-laws-camp.md new file mode 100644 index 0000000000..bba1a0714f --- /dev/null +++ b/.changeset/dull-laws-camp.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': patch +--- + +Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. Ref Discord thread: https://discord.com/channels/687207715902193673/687235481154617364/1154020909871550525 From f01beeff5bbd9a8792a028feed439dadc2b625b4 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Wed, 20 Sep 2023 16:50:46 +0200 Subject: [PATCH 5/7] Remove discord reference in changeset Signed-off-by: Nikolai Thingnes Leira --- .changeset/dull-laws-camp.md | 4 +++- .changeset/witty-buttons-admire.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.changeset/dull-laws-camp.md b/.changeset/dull-laws-camp.md index bba1a0714f..9a9c7436c5 100644 --- a/.changeset/dull-laws-camp.md +++ b/.changeset/dull-laws-camp.md @@ -2,4 +2,6 @@ '@backstage/create-app': patch --- -Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. Ref Discord thread: https://discord.com/channels/687207715902193673/687235481154617364/1154020909871550525 +Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. + +You can apply these change to your own `Dockerfile` by replacing `node:18-bullseye-slim` with `node:18-bookworm-slim` diff --git a/.changeset/witty-buttons-admire.md b/.changeset/witty-buttons-admire.md index 77d7ab5f82..1c0eefa3c7 100644 --- a/.changeset/witty-buttons-admire.md +++ b/.changeset/witty-buttons-admire.md @@ -2,4 +2,6 @@ 'example-backend': patch --- -Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. Ref Discord thread: https://discord.com/channels/687207715902193673/687235481154617364/1154020909871550525 +Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. + +You can apply these change to your own `Dockerfile` by replacing `node:18-bullseye-slim` with `node:18-bookworm-slim` From 35d178e3cd795f4c0dab3ccf191b000de92959e5 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Thu, 21 Sep 2023 09:09:55 +0200 Subject: [PATCH 6/7] Update Dockerfile mkdocs setup to fix build errors Signed-off-by: Nikolai Thingnes Leira --- .changeset/witty-buttons-admire.md | 7 ------- packages/backend/Dockerfile | 12 +++++++++--- 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 .changeset/witty-buttons-admire.md diff --git a/.changeset/witty-buttons-admire.md b/.changeset/witty-buttons-admire.md deleted file mode 100644 index 1c0eefa3c7..0000000000 --- a/.changeset/witty-buttons-admire.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'example-backend': patch ---- - -Change base node image from node:18-bullseye-slim to node:18-bookworm-slim due to Docker build error on bullseye. - -You can apply these change to your own `Dockerfile` by replacing `node:18-bullseye-slim` with `node:18-bookworm-slim` diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile index 11f075d1cc..5667209330 100644 --- a/packages/backend/Dockerfile +++ b/packages/backend/Dockerfile @@ -18,9 +18,15 @@ FROM node:18-bookworm-slim RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt-get update && \ - apt-get install -y --no-install-recommends libsqlite3-dev python3 python3-pip build-essential && \ - yarn config set python /usr/bin/python3 && \ - pip3 install mkdocs-techdocs-core==1.1.7 + apt-get install -y --no-install-recommends libsqlite3-dev python3 python3-pip python3-venv build-essential && \ + yarn config set python /usr/bin/python3 + +# Set up a virtual environment for mkdocs-techdocs-core. +ENV VIRTUAL_ENV=/opt/venv +RUN python3 -m venv $VIRTUAL_ENV +ENV PATH="$VIRTUAL_ENV/bin:$PATH" + +RUN pip3 install mkdocs-techdocs-core==1.1.7 # From here on we use the least-privileged `node` user to run the backend. WORKDIR /app From ab408c36ccc7fc2ec370b8cc8540b3c5a06051c6 Mon Sep 17 00:00:00 2001 From: Nikolai Thingnes Leira Date: Sat, 23 Sep 2023 16:13:12 +0200 Subject: [PATCH 7/7] Empty commit to check E2E checks Signed-off-by: Nikolai Thingnes Leira