From 0d667e7fca0208976835f065c2ffb81bbb2ac4bb Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 23 Mar 2022 09:52:27 +0000 Subject: [PATCH 1/3] watchtower should restart if it crashes --- hosting/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index 8143be54b7..ff3a3a6b87 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -105,6 +105,7 @@ services: - redis_data:/data watchtower-service: + restart: always image: containrrr/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock From d93d4d08f2b86d5053546cc98aafe0626e839bb5 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 24 Mar 2022 17:35:35 +0000 Subject: [PATCH 2/3] update always to unless-stopped --- hosting/docker-compose.yaml | 12 ++++++------ .../customer-categories/docker-compose.yml | 4 ++-- .../scripts/integrations/oracle/docker-compose.yml | 2 +- .../scripts/integrations/postgres/docker-compose.yml | 4 ++-- .../integrations/service-vehicles/docker-compose.yml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index ff3a3a6b87..f3055b19fa 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -4,7 +4,7 @@ version: "3" services: app-service: - restart: always + restart: unless-stopped image: budibase.docker.scarf.sh/budibase/apps container_name: bbapps environment: @@ -28,7 +28,7 @@ services: - redis-service worker-service: - restart: always + restart: unless-stopped image: budibase.docker.scarf.sh/budibase/worker container_name: bbworker environment: @@ -53,7 +53,7 @@ services: - couch-init minio-service: - restart: always + restart: unless-stopped image: minio/minio volumes: - minio_data:/data @@ -69,7 +69,7 @@ services: retries: 3 proxy-service: - restart: always + restart: unless-stopped ports: - "${MAIN_PORT}:10000" container_name: bbproxy @@ -81,7 +81,7 @@ services: - couchdb-service couchdb-service: - restart: always + restart: unless-stopped image: ibmcom/couchdb3 environment: - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD} @@ -98,7 +98,7 @@ services: command: ["sh","-c","sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;"] redis-service: - restart: always + restart: unless-stopped image: redis command: redis-server --requirepass ${REDIS_PASSWORD} volumes: diff --git a/packages/server/scripts/integrations/customer-categories/docker-compose.yml b/packages/server/scripts/integrations/customer-categories/docker-compose.yml index 4dfcb0e1ad..069033001b 100644 --- a/packages/server/scripts/integrations/customer-categories/docker-compose.yml +++ b/packages/server/scripts/integrations/customer-categories/docker-compose.yml @@ -3,7 +3,7 @@ services: db: container_name: postgres image: postgres - restart: always + restart: unless-stopped environment: POSTGRES_USER: root POSTGRES_PASSWORD: root @@ -17,7 +17,7 @@ services: pgadmin: container_name: pgadmin-pg image: dpage/pgadmin4 - restart: always + restart: unless-stopped environment: PGADMIN_DEFAULT_EMAIL: root@root.com PGADMIN_DEFAULT_PASSWORD: root diff --git a/packages/server/scripts/integrations/oracle/docker-compose.yml b/packages/server/scripts/integrations/oracle/docker-compose.yml index c54cd0a40b..15b4c16eee 100644 --- a/packages/server/scripts/integrations/oracle/docker-compose.yml +++ b/packages/server/scripts/integrations/oracle/docker-compose.yml @@ -4,7 +4,7 @@ version: "3.8" services: db: - restart: always + restart: unless-stopped platform: linux/x86_64 image: container-registry.oracle.com/database/express:18.4.0-xe environment: diff --git a/packages/server/scripts/integrations/postgres/docker-compose.yml b/packages/server/scripts/integrations/postgres/docker-compose.yml index 2323025e5e..d682ad7361 100644 --- a/packages/server/scripts/integrations/postgres/docker-compose.yml +++ b/packages/server/scripts/integrations/postgres/docker-compose.yml @@ -3,7 +3,7 @@ services: db: container_name: postgres image: postgres - restart: always + restart: unless-stopped environment: POSTGRES_USER: root POSTGRES_PASSWORD: root @@ -17,7 +17,7 @@ services: pgadmin: container_name: pgadmin-pg image: dpage/pgadmin4 - restart: always + restart: unless-stopped environment: PGADMIN_DEFAULT_EMAIL: root@root.com PGADMIN_DEFAULT_PASSWORD: root diff --git a/packages/server/scripts/integrations/service-vehicles/docker-compose.yml b/packages/server/scripts/integrations/service-vehicles/docker-compose.yml index 7473e540db..96141d14d8 100644 --- a/packages/server/scripts/integrations/service-vehicles/docker-compose.yml +++ b/packages/server/scripts/integrations/service-vehicles/docker-compose.yml @@ -3,7 +3,7 @@ services: db: container_name: postgres-vehicle image: postgres - restart: always + restart: unless-stopped environment: POSTGRES_USER: root POSTGRES_PASSWORD: root @@ -17,7 +17,7 @@ services: pgadmin: container_name: pgadmin image: dpage/pgadmin4 - restart: always + restart: unless-stopped environment: PGADMIN_DEFAULT_EMAIL: root@root.com PGADMIN_DEFAULT_PASSWORD: root From c276c8512415296ffab3647edf16a750f2ef613f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 24 Mar 2022 18:31:41 +0000 Subject: [PATCH 3/3] v1.0.95 --- 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 0ab734ac77..768024096e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.94", + "version": "1.0.95", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f63207850b..2b4e62c95c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.94", + "version": "1.0.95", "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 de4269d1aa..c50ba19c23 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.94", + "version": "1.0.95", "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.94", + "@budibase/string-templates": "^1.0.95", "@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 56151f018f..9a78cda070 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.94", + "version": "1.0.95", "license": "GPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.94", - "@budibase/client": "^1.0.94", - "@budibase/frontend-core": "^1.0.94", - "@budibase/string-templates": "^1.0.94", + "@budibase/bbui": "^1.0.95", + "@budibase/client": "^1.0.95", + "@budibase/frontend-core": "^1.0.95", + "@budibase/string-templates": "^1.0.95", "@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 6297b5001c..3aca35e24c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.94", + "version": "1.0.95", "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 4b2ccf84e4..4d76d35752 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.94", + "version": "1.0.95", "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.94", - "@budibase/frontend-core": "^1.0.94", - "@budibase/string-templates": "^1.0.94", + "@budibase/bbui": "^1.0.95", + "@budibase/frontend-core": "^1.0.95", + "@budibase/string-templates": "^1.0.95", "@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 851eba6e28..fede9df608 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.94", + "version": "1.0.95", "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.94", + "@budibase/bbui": "^1.0.95", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index f12064c6e5..50d9984013 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.94", + "version": "1.0.95", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -71,9 +71,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.94", - "@budibase/client": "^1.0.94", - "@budibase/string-templates": "^1.0.94", + "@budibase/backend-core": "^1.0.95", + "@budibase/client": "^1.0.95", + "@budibase/string-templates": "^1.0.95", "@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 bc28ac69b5..8c8e34109b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.94", + "version": "1.0.95", "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 e1909e2e04..459ac97084 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.94", + "version": "1.0.95", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,8 +34,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.94", - "@budibase/string-templates": "^1.0.94", + "@budibase/backend-core": "^1.0.95", + "@budibase/string-templates": "^1.0.95", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",