From 643d9e564ce161acc20751af32d14fe956c2e763 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 May 2025 10:50:13 +0200 Subject: [PATCH 1/4] Update budibase/couchdb base image to use node 22 --- hosting/couchdb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index b95fa348f8..cfbe0b2840 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -4,7 +4,7 @@ # Dockerfile. Only modifications related to upgrading from Debian bullseye to # bookworm have been included. The `runner` image contains Budibase's # customisations to the image, e.g. adding Clouseau. -FROM node:20-slim AS base +FROM node:22-slim AS base # Add CouchDB user account to make sure the IDs are assigned consistently RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb From 85e437995a1ac240a51f540ade2813dc10405f90 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 May 2025 11:07:33 +0200 Subject: [PATCH 2/4] Scripts --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e93f46b3a7..eff34fdbaa 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,8 @@ "build:docker:single": "./scripts/build-single-image.sh", "build:docker:single:sqs": "./scripts/build-single-image-sqs.sh", "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting", - "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.3.3 -t budibase/couchdb:v3.3.3-sqs-v2.1.1 --push ./hosting/couchdb", + "build:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.3.3 -t budibase/couchdb:v3.3.3-sqs-v2.1.1 ./hosting/couchdb", + "publish:docker:couch": "yarn build:docker:couch --push", "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting", "env:multi:enable": "lerna run --stream env:multi:enable", "env:multi:disable": "lerna run --stream env:multi:disable", From 3baf5a92e2b6925a9a38f174e53314058d4c892a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 May 2025 11:10:10 +0200 Subject: [PATCH 3/4] Update tags --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eff34fdbaa..ad54898f46 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "build:docker:single": "./scripts/build-single-image.sh", "build:docker:single:sqs": "./scripts/build-single-image-sqs.sh", "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting", - "build:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.3.3 -t budibase/couchdb:v3.3.3-sqs-v2.1.1 ./hosting/couchdb", + "build:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:v3.3.3-alpha ./hosting/couchdb", "publish:docker:couch": "yarn build:docker:couch --push", "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting", "env:multi:enable": "lerna run --stream env:multi:enable", From b57387dafcd712eb6d841558858bb992012674d5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 May 2025 12:38:27 +0200 Subject: [PATCH 4/4] Undo script changes --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index ad54898f46..e93f46b3a7 100644 --- a/package.json +++ b/package.json @@ -78,8 +78,7 @@ "build:docker:single": "./scripts/build-single-image.sh", "build:docker:single:sqs": "./scripts/build-single-image-sqs.sh", "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting", - "build:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:v3.3.3-alpha ./hosting/couchdb", - "publish:docker:couch": "yarn build:docker:couch --push", + "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.3.3 -t budibase/couchdb:v3.3.3-sqs-v2.1.1 --push ./hosting/couchdb", "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting", "env:multi:enable": "lerna run --stream env:multi:enable", "env:multi:disable": "lerna run --stream env:multi:disable",