CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-30 20:10:54 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix/cross-tenant-apps-with-session

Browse source
This commit is contained in:
Rory Powell 2022-03-25 10:53:10 +00:00
parent e68e7afa9f 79f6f92dd4
commit 36a7323676
15 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
hosting/docker-compose.yaml
View file

@ -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,13 +98,14 @@ 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:
- redis_data:/data
watchtower-service:
restart: always
image: containrrr/watchtower
volumes:
- /var/run/docker.sock:/var/run/docker.sock

2
lerna.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.94",
"version": "1.0.95",
"npmClient": "yarn",
"packages": [
"packages/*"

2
packages/backend-core/package.json
View file

@ -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",

4
packages/bbui/package.json
View file

@ -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",

10
packages/builder/package.json
View file

@ -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",

2
packages/cli/package.json
View file

@ -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": {

8
packages/client/package.json
View file

@ -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",

4
packages/frontend-core/package.json
View file

@ -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"
}

8
packages/server/package.json
View file

@ -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",

4
packages/server/scripts/integrations/customer-categories/docker-compose.yml
View file

@ -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

2
packages/server/scripts/integrations/oracle/docker-compose.yml
View file

@ -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:

4
packages/server/scripts/integrations/postgres/docker-compose.yml
View file

@ -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

4
packages/server/scripts/integrations/service-vehicles/docker-compose.yml
View file

@ -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

2
packages/string-templates/package.json
View file

@ -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",

6
packages/worker/package.json
View file

@ -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",