From 57ac6e414f496728e7aac0d0a95d7dc01cb095e5 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 27 May 2022 15:36:34 +0100 Subject: [PATCH 1/3] gyp fixes for slim docker image --- packages/server/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index d8ad37d80b..f70fdbca95 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -1,7 +1,5 @@ FROM node:14-slim -RUN apt-get update - LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh" LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh" LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh" @@ -16,8 +14,12 @@ ENV BUDIBASE_ENVIRONMENT=PRODUCTION # copy files and install dependencies COPY . ./ # handle node-gyp -RUN apk add --no-cache --virtual .gyp python3 make g++ \ - && yarn && apk del .gyp +RUN apt-get update \ + && apt-get install -y --no-install-recommends g++ make python \ + && yarn \ + && yarn cache clean \ + && apt-get remove -y --purge --auto-remove g++ make python \ + && rm -rf /tmp/* /root/.node-gyp /usr/local/lib/node_modules/npm/node_modules/node-gyp RUN yarn global add pm2 RUN yarn build From 757771908b1e2cf384eef4dc6e6cae48b671f4b0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 27 May 2022 14:48:22 +0000 Subject: [PATCH 2/3] v1.0.188-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 3ce6a69194..c6b1d5133c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 144eb9b621..bbf2c920e4 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f6e75bcba0..d73180d297 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.188-alpha.1", + "@budibase/string-templates": "^1.0.188-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 628bc0ce6d..9003e88149 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.188-alpha.1", - "@budibase/client": "^1.0.188-alpha.1", - "@budibase/frontend-core": "^1.0.188-alpha.1", - "@budibase/string-templates": "^1.0.188-alpha.1", + "@budibase/bbui": "^1.0.188-alpha.2", + "@budibase/client": "^1.0.188-alpha.2", + "@budibase/frontend-core": "^1.0.188-alpha.2", + "@budibase/string-templates": "^1.0.188-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 644a4671d3..b225773282 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index c2382e6f0d..9cca4f5d7e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.188-alpha.1", - "@budibase/frontend-core": "^1.0.188-alpha.1", - "@budibase/string-templates": "^1.0.188-alpha.1", + "@budibase/bbui": "^1.0.188-alpha.2", + "@budibase/frontend-core": "^1.0.188-alpha.2", + "@budibase/string-templates": "^1.0.188-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 546c3de615..182d408f88 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.188-alpha.1", + "@budibase/bbui": "^1.0.188-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 6b8f684c28..31c2edb819 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.188-alpha.1", - "@budibase/client": "^1.0.188-alpha.1", + "@budibase/backend-core": "^1.0.188-alpha.2", + "@budibase/client": "^1.0.188-alpha.2", "@budibase/pro": "1.0.188-alpha.1", - "@budibase/string-templates": "^1.0.188-alpha.1", + "@budibase/string-templates": "^1.0.188-alpha.2", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e923c067cd..462e380978 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index ab3d4412f4..99f3d6063f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.188-alpha.1", + "version": "1.0.188-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.188-alpha.1", + "@budibase/backend-core": "^1.0.188-alpha.2", "@budibase/pro": "1.0.188-alpha.1", - "@budibase/string-templates": "^1.0.188-alpha.1", + "@budibase/string-templates": "^1.0.188-alpha.2", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 262767adff2497f687586a4c408d969f1931e5a2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 27 May 2022 14:50:06 +0000 Subject: [PATCH 3/3] Update pro version to 1.0.188-alpha.2 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 31c2edb819..363ecec795 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.188-alpha.2", "@budibase/client": "^1.0.188-alpha.2", - "@budibase/pro": "1.0.188-alpha.1", + "@budibase/pro": "1.0.188-alpha.2", "@budibase/string-templates": "^1.0.188-alpha.2", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 99f3d6063f..d1c84a3527 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.188-alpha.2", - "@budibase/pro": "1.0.188-alpha.1", + "@budibase/pro": "1.0.188-alpha.2", "@budibase/string-templates": "^1.0.188-alpha.2", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",