From 6e0ea61d92882be9786a15b1bada2b1ab8c9ba1f Mon Sep 17 00:00:00 2001 From: Petr Stribny <petr@stribny.name> Date: Thu, 3 Mar 2022 14:22:53 +0000 Subject: [PATCH] Prepare for 1.9.1 --- README.md | 4 +-- backend/setup.py | 2 +- backend/src/baserow/config/settings/base.py | 2 +- backend/src/baserow/version.py | 2 +- changelog.md | 2 ++ deploy/all-in-one/README.md | 32 ++++++++--------- deploy/all-in-one/supervisor/start.sh | 2 +- deploy/cloudron/CloudronManifest.json | 2 +- deploy/cloudron/Dockerfile | 2 +- deploy/cloudron/README.md | 2 +- docker-compose.yml | 10 +++--- docs/installation/install-on-cloudron.md | 4 +-- docs/installation/install-on-ubuntu.md | 4 +-- .../install-using-standalone-images.md | 12 +++---- docs/installation/install-with-docker.md | 34 +++++++++---------- heroku.Dockerfile | 2 +- web-frontend/package.json | 2 +- 17 files changed, 61 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index dd5bf0a26..be1f86831 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ tool gives you the powers of a developer without leaving your browser. [](https://heroku.com/deploy?template=https://github.com/bram2w/baserow/tree/master) ```bash -docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.9 +docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.9.1 ```  @@ -86,7 +86,7 @@ Created by Baserow B.V. - bram@baserow.io. Distributes under the MIT license. See `LICENSE` for more information. -Version: 1.9 +Version: 1.9.1 The official repository can be found at https://gitlab.com/bramw/baserow. diff --git a/backend/setup.py b/backend/setup.py index e66695124..47fb1d7d0 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -6,7 +6,7 @@ from setuptools import find_packages, setup PROJECT_DIR = os.path.dirname(__file__) REQUIREMENTS_DIR = os.path.join(PROJECT_DIR, "requirements") -VERSION = "1.9" +VERSION = "1.9.1" def get_requirements(env): diff --git a/backend/src/baserow/config/settings/base.py b/backend/src/baserow/config/settings/base.py index 0858c9e78..f05b88bc5 100644 --- a/backend/src/baserow/config/settings/base.py +++ b/backend/src/baserow/config/settings/base.py @@ -254,7 +254,7 @@ SPECTACULAR_SETTINGS = { "name": "MIT", "url": "https://gitlab.com/bramw/baserow/-/blob/master/LICENSE", }, - "VERSION": "1.9", + "VERSION": "1.9.1", "SERVE_INCLUDE_SCHEMA": False, "TAGS": [ {"name": "Settings"}, diff --git a/backend/src/baserow/version.py b/backend/src/baserow/version.py index 063bf41fa..044c1805b 100644 --- a/backend/src/baserow/version.py +++ b/backend/src/baserow/version.py @@ -1 +1 @@ -VERSION = "1.9" +VERSION = "1.9.1" diff --git a/changelog.md b/changelog.md index 432191d42..e01a6c7dc 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,8 @@ ## Unreleased +## Released (2022-03-03 1.9.1) + * Fixed bug when importing a formula or lookup field with an incorrect empty value. * New templates: * Non-profit Organization Management diff --git a/deploy/all-in-one/README.md b/deploy/all-in-one/README.md index 81fc6736f..d75110409 100644 --- a/deploy/all-in-one/README.md +++ b/deploy/all-in-one/README.md @@ -15,7 +15,7 @@ tool gives you the powers of a developer without leaving your browser. [Vue.js](https://vuejs.org/) and [PostgreSQL](https://www.postgresql.org/). ```bash -docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.9 +docker run -v baserow_data:/baserow/data -p 80:80 -p 443:443 baserow/baserow:1.9.1 ``` ## Quick Reference @@ -49,7 +49,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` * Change `BASEROW_PUBLIC_URL` to `https://YOUR_DOMAIN` or `http://YOUR_IP` to enable @@ -71,7 +71,7 @@ docker run \ ## Image Feature Overview -The `baserow/baserow:1.9` image by default runs all of Baserow's various services in a +The `baserow/baserow:1.9.1` image by default runs all of Baserow's various services in a single container for ease of use. A quick summary of its features are: * Runs a Postgres database and Redis server by default internally and stores all data in @@ -114,7 +114,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### Behind a reverse proxy already handling ssl @@ -127,7 +127,7 @@ docker run \ -v baserow_data:/baserow/data \ -p 80:80 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### On a nonstandard HTTP port @@ -140,7 +140,7 @@ docker run \ -v baserow_data:/baserow/data \ -p 3001:80 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With an external PostgresSQL server @@ -159,7 +159,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With an external Redis server @@ -178,7 +178,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With an external email server @@ -198,7 +198,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### Start just the embedded database @@ -211,7 +211,7 @@ docker run -it \ --name baserow \ -p 5432:5432 \ -v baserow_data:/baserow/data \ - baserow/baserow:1.9 \ + baserow/baserow:1.9.1 \ start-only-db # Now get the password from docker exec -it baserow cat /baserow/data/.pgpass @@ -229,7 +229,7 @@ docker run -it \ --rm \ --name baserow \ -v baserow_data:/baserow/data \ - baserow/baserow:1.9 \ + baserow/baserow:1.9.1 \ backend-cmd-with-db manage dbshell ``` @@ -286,16 +286,16 @@ the command below. ```bash # First read the help message for this command -docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9 \ +docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9.1 \ backend-cmd-with-db backup # By default backs up to the backups folder in the baserow_data volume. -docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9 \ +docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9.1 \ backend-cmd-with-db backup -f /baserow/data/backups/backup.tar.gz # Or backup to a file on your host instead run something like: docker run -it --rm -v baserow_data:/baserow/data -v $PWD:/baserow/host \ - baserow/baserow:1.9 backend-cmd-with-db backup -f /baserow/host/backup.tar.gz + baserow/baserow:1.9.1 backend-cmd-with-db backup -f /baserow/host/backup.tar.gz ``` ### Restore only Baserow's Postgres Database @@ -364,7 +364,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` Or you can just store it directly in the volume at `baserow_data/env` meaning it will @@ -373,7 +373,7 @@ be loaded whenever you mount in this data volume. ### Building your own image from Baserow ```dockerfile -FROM baserow/baserow:1.9 +FROM baserow/baserow:1.9.1 # Any .sh files found in /baserow/supervisor/env/ will be sourced and loaded at startup # useful for storing your own environment variable overrides. diff --git a/deploy/all-in-one/supervisor/start.sh b/deploy/all-in-one/supervisor/start.sh index 3b04418bf..2ebc19895 100755 --- a/deploy/all-in-one/supervisor/start.sh +++ b/deploy/all-in-one/supervisor/start.sh @@ -14,7 +14,7 @@ cat << EOF ██████╔╝██║ ██║███████║███████╗██║ ██║╚██████╔╝╚███╔███╔╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝╚══════╝╚═╝ ╚═╝ ╚═════╝ ╚══╝╚══╝ -Version 1.9 +Version 1.9.1 ========================================================================================= EOF diff --git a/deploy/cloudron/CloudronManifest.json b/deploy/cloudron/CloudronManifest.json index 29e4fff38..0a48d70a0 100644 --- a/deploy/cloudron/CloudronManifest.json +++ b/deploy/cloudron/CloudronManifest.json @@ -8,7 +8,7 @@ "contactEmail": "bram@baserow.io", "icon": "file://logo.png", "tags": ["no-code", "nocode", "database", "data", "collaborate", "airtable"], - "version": "1.9", + "version": "1.9.1", "healthCheckPath": "/api/_health", "httpPort": 80, "addons": { diff --git a/deploy/cloudron/Dockerfile b/deploy/cloudron/Dockerfile index 5826591f0..19f64e027 100644 --- a/deploy/cloudron/Dockerfile +++ b/deploy/cloudron/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_IMAGE=baserow/baserow:1.9 +ARG FROM_IMAGE=baserow/baserow:1.9.1 # This is pinned as version pinning is done by the CI setting FROM_IMAGE. # hadolint ignore=DL3006 FROM $FROM_IMAGE as image_base diff --git a/deploy/cloudron/README.md b/deploy/cloudron/README.md index 73a774ee0..7c9cd0e32 100644 --- a/deploy/cloudron/README.md +++ b/deploy/cloudron/README.md @@ -31,5 +31,5 @@ guide for more details. * [`X.Y.Z`](https://gitlab.com/bramw/baserow/-/blob/master/deploy/cloudron/Dockerfile) Tagged by Baserow version. * [`latest`](https://gitlab.com/bramw/baserow/-/blob/master/deploy/cloudron/Dockerfile) -* [`develop-latest`](https://gitlab.com/bramw/baserow/-/blob/1.9/deploy/cloudron/Dockerfile) +* [`develop-latest`](https://gitlab.com/bramw/baserow/-/blob/develop/deploy/cloudron/Dockerfile) This is a bleeding edge image from our development branch, use at your own risk. diff --git a/docker-compose.yml b/docker-compose.yml index a9edf2787..0aab0d2cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -176,7 +176,7 @@ services: local: backend: - image: baserow/backend:1.9 + image: baserow/backend:1.9.1 restart: unless-stopped environment: <<: *common-backend-variables @@ -189,7 +189,7 @@ services: local: web-frontend: - image: baserow/web-frontend:1.9 + image: baserow/web-frontend:1.9.1 restart: unless-stopped environment: <<: *common-variables @@ -199,7 +199,7 @@ services: local: celery: - image: baserow/backend:1.9 + image: baserow/backend:1.9.1 restart: unless-stopped environment: <<: *common-backend-variables @@ -216,7 +216,7 @@ services: local: celery-export-worker: - image: baserow/backend:1.9 + image: baserow/backend:1.9.1 restart: unless-stopped command: celery-exportworker # The backend image's baked in healthcheck defaults to the django healthcheck @@ -233,7 +233,7 @@ services: local: celery-beat-worker: - image: baserow/backend:1.9 + image: baserow/backend:1.9.1 restart: unless-stopped command: celery-beat # We don't yet have a healthcheck for the beat worker, just assume it is healthy. diff --git a/docs/installation/install-on-cloudron.md b/docs/installation/install-on-cloudron.md index 265ab63f8..d0de6b607 100644 --- a/docs/installation/install-on-cloudron.md +++ b/docs/installation/install-on-cloudron.md @@ -46,7 +46,7 @@ $ cd baserow/deploy/cloudron After that you can install the Baserow Cloudron app by executing the following commands. ``` -$ cloudron install -l baserow.{YOUR_DOMAIN} --image baserow/cloudron:1.9 +$ cloudron install -l baserow.{YOUR_DOMAIN} --image baserow/cloudron:1.9.1 App is being installed. ... App is installed. @@ -89,7 +89,7 @@ the `baserow/deploy/cloudron` folder, you can upgrade your cloudron baserow serv the latest version by running the following command: ``` -cloudron update --app {YOUR_APP_ID} --image baserow/cloudron:1.9 +cloudron update --app {YOUR_APP_ID} --image baserow/cloudron:1.9.1 ``` > Note that you must replace the image with the most recent image of Baserow. The diff --git a/docs/installation/install-on-ubuntu.md b/docs/installation/install-on-ubuntu.md index cce7f6c13..6921a9912 100644 --- a/docs/installation/install-on-ubuntu.md +++ b/docs/installation/install-on-ubuntu.md @@ -34,7 +34,7 @@ docker run -e BASEROW_PUBLIC_URL=http://localhost \ -v baserow_data:/baserow/data \ -p 80:80 \ -p 443:443 \ -baserow/baserow:1.9 +baserow/baserow:1.9.1 # Watch the logs for Baserow to come available by running: docker logs baserow ``` @@ -147,7 +147,7 @@ docker run \ -v /baserow/media:/baserow/data/media \ -p 80:80 \ -p 443:443 \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 # Check the logs and wait for Baserow to become available docker logs baserow ``` diff --git a/docs/installation/install-using-standalone-images.md b/docs/installation/install-using-standalone-images.md index 91fcb8805..bde712f7c 100644 --- a/docs/installation/install-using-standalone-images.md +++ b/docs/installation/install-using-standalone-images.md @@ -10,9 +10,9 @@ Baserow consists of a number of services, two of which are built and provided as separate standalone images by us: -* `baserow/backend:1.9` which by default starts the Gunicorn Django backend server +* `baserow/backend:1.9.1` which by default starts the Gunicorn Django backend server for Baserow but is also used to start the celery workers and celery beat services. -* `baserow/web-frontend:1.9` which is a Nuxt server providing Server Side rendering +* `baserow/web-frontend:1.9.1` which is a Nuxt server providing Server Side rendering for the website. If you want to use your own container orchestration software like Kubernetes then these @@ -27,10 +27,10 @@ in the root of our repository. These are all the services you need to set up to run a Baserow using the standalone images: -* `baserow/backend:1.9` (default command is `gunicorn`) -* `baserow/backend:1.9` with command `celery-worker` -* `baserow/backend:1.9` with command `celery-export-worker` -* `baserow/web-frontend:1.9` (default command is `nuxt-local`) +* `baserow/backend:1.9.1` (default command is `gunicorn`) +* `baserow/backend:1.9.1` with command `celery-worker` +* `baserow/backend:1.9.1` with command `celery-export-worker` +* `baserow/web-frontend:1.9.1` (default command is `nuxt-local`) * A postgres database * A redis server diff --git a/docs/installation/install-with-docker.md b/docs/installation/install-with-docker.md index b10747eaa..c96347b0f 100644 --- a/docs/installation/install-with-docker.md +++ b/docs/installation/install-with-docker.md @@ -27,7 +27,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` * Change `BASEROW_PUBLIC_URL` to `https://YOUR_DOMAIN` or `http://YOUR_IP` to enable @@ -49,7 +49,7 @@ docker run \ ## Image Feature Overview -The `baserow/baserow:1.9` image by default runs all of Baserow's various services in a +The `baserow/baserow:1.9.1` image by default runs all of Baserow's various services in a single container for ease of use. A quick summary of its features are: * Runs a Postgres database and Redis server by default internally and stores all data in @@ -92,7 +92,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### Behind a reverse proxy already handling ssl @@ -105,7 +105,7 @@ docker run \ -v baserow_data:/baserow/data \ -p 80:80 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### On a nonstandard HTTP port @@ -118,7 +118,7 @@ docker run \ -v baserow_data:/baserow/data \ -p 3001:80 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With an external PostgresSQL server @@ -137,7 +137,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With an external Redis server @@ -156,7 +156,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With an external email server @@ -176,7 +176,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` ### With a Postgresql server running on the same host as the Baserow docker container @@ -213,7 +213,7 @@ docker run \ -v baserow_data:/baserow/data \ -p 80:80 \ -p 443:443 \ - baserow/baserow:1.8.3 + baserow/baserow:1.9.1 ``` ### Supply secrets using files @@ -239,7 +239,7 @@ docker run \ -v baserow_data:/baserow/data \ -p 80:80 \ -p 443:443 \ - baserow/baserow:1.8.3 + baserow/baserow:1.9.1 ``` ### Start just the embedded database @@ -252,7 +252,7 @@ docker run -it \ --name baserow \ -p 5432:5432 \ -v baserow_data:/baserow/data \ - baserow/baserow:1.9 \ + baserow/baserow:1.9.1 \ start-only-db # Now get the password from docker exec -it baserow cat /baserow/data/.pgpass @@ -270,7 +270,7 @@ docker run -it \ --rm \ --name baserow \ -v baserow_data:/baserow/data \ - baserow/baserow:1.9 \ + baserow/baserow:1.9.1 \ backend-cmd-with-db manage dbshell ``` @@ -327,16 +327,16 @@ the command below. ```bash # First read the help message for this command -docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9 \ +docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9.1 \ backend-cmd-with-db backup # By default backs up to the backups folder in the baserow_data volume. -docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9 \ +docker run -it --rm -v baserow_data:/baserow/data baserow/baserow:1.9.1 \ backend-cmd-with-db backup -f /baserow/data/backups/backup.tar.gz # Or backup to a file on your host instead run something like: docker run -it --rm -v baserow_data:/baserow/data -v $PWD:/baserow/host \ - baserow/baserow:1.9 backend-cmd-with-db backup -f /baserow/host/backup.tar.gz + baserow/baserow:1.9.1 backend-cmd-with-db backup -f /baserow/host/backup.tar.gz ``` ### Restore only Baserow's Postgres Database @@ -405,7 +405,7 @@ docker run \ -p 80:80 \ -p 443:443 \ --restart unless-stopped \ - baserow/baserow:1.9 + baserow/baserow:1.9.1 ``` Or you can just store it directly in the volume at `baserow_data/env` meaning it will @@ -415,7 +415,7 @@ be loaded whenever you mount in this data volume. ### Building your own image from Baserow ```dockerfile -FROM baserow/baserow:1.9 +FROM baserow/baserow:1.9.1 # Any .sh files found in /baserow/supervisor/env/ will be sourced and loaded at startup # useful for storing your own environment variable overrides. diff --git a/heroku.Dockerfile b/heroku.Dockerfile index b1197015e..9d8cd3ca3 100644 --- a/heroku.Dockerfile +++ b/heroku.Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_IMAGE=baserow/baserow:1.9 +ARG FROM_IMAGE=baserow/baserow:1.9.1 # This is pinned as version pinning is done by the CI setting FROM_IMAGE. # hadolint ignore=DL3006 FROM $FROM_IMAGE as image_base diff --git a/web-frontend/package.json b/web-frontend/package.json index 18a70086b..f4aa01850 100644 --- a/web-frontend/package.json +++ b/web-frontend/package.json @@ -1,6 +1,6 @@ { "name": "baserow", - "version": "1.9.0", + "version": "1.9.1", "private": true, "description": "Baserow: open source no-code database web frontend.", "author": "Bram Wiepjes (Baserow)",