archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-04 13:15:24 +00:00
Code Issues Projects Releases Wiki Activity

Change the way variables are used (no substitution as empty value will be the default result)

Browse source
This commit is contained in:
Erwan Daubert 2021-12-15 12:26:02 +00:00 • committed by Nigel Gott
parent bc5d397f50
commit 0128d06c47
2 changed files with 17 additions and 17 deletions

12
dev.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
# Bash strict mode: http://redsymbol.net/articles/unofficial-bash-strict-mode/
set -euo pipefail
set -eo pipefail
tabname() {
@ -197,15 +197,15 @@ fi
# Set various env variables to sensible defaults if they have not already been set by
# the user.
if [[ -z "${UID:-}" ]]; then
if [[ -z "$UID" ]]; then
UID=$(id -u)
export UID
fi
export UID
if [[ -z "${GID:-}" ]]; then
export GID
if [[ -z "$GID" ]]; then
GID=$(id -g)
fi
export GID
if [[ -z "${MIGRATE_ON_STARTUP:-}" ]]; then
@ -250,7 +250,7 @@ docker-compose -f docker-compose.yml -f docker-compose.dev.yml build "$@"
fi
if [ "$delete_db_volume" = true ] ; then
docker volume rm baserow_pgdata
docker volume rm baserow_pgdata
fi
if [ "$up" = true ] ; then

22
docker-compose.dev.yml
View file

@ -13,8 +13,8 @@ services:
args:
# We allow configuring the UID/GID here so you can run as the dev's actual user
# reducing the chance the containers screw up the bind mounted folders.
UID: "${UID:-}"
GID: "${GID:-}"
UID: $UID
GID: $GID
image: baserow_backend_dev:latest
volumes:
- ./backend:/baserow/backend
@ -31,8 +31,8 @@ services:
args:
# We allow configuring the UID/GID here so you can run as the dev's actual user
# reducing the chance the containers screw up the bind mounted folders.
UID: "${UID:-}"
GID: "${GID:-}"
UID: $UID
GID: $GID
command: celery-dev worker -l INFO -Q celery
volumes:
- ./backend:/baserow/backend
@ -49,8 +49,8 @@ services:
args:
# We allow configuring the UID/GID here so you can run as the dev's actual user
# reducing the chance the containers screw up the bind mounted folders.
UID: "${UID:-}"
GID: "${GID:-}"
UID: $UID
GID: $GID
command: celery-dev worker -l INFO -Q export
volumes:
- ./backend:/baserow/backend
@ -67,8 +67,8 @@ services:
args:
# We allow configuring the UID/GID here so you can run as the dev's actual user
# reducing the chance the containers screw up the bind mounted folders.
UID: "${UID:-}"
GID: "${GID:-}"
UID: $UID
GID: $GID
command: celery-dev beat -l INFO -S redbeat.RedBeatScheduler
volumes:
- ./backend:/baserow/backend
@ -84,8 +84,8 @@ services:
args:
# We allow configuring the UID/GID here so you can run as the dev's actual user
# reducing the chance the containers screw up the bind mounted folders.
UID: "${UID:-}"
GID: "${GID:-}"
UID: $UID
GID: $GID
image: baserow_web-frontend_dev:latest
volumes:
- ./web-frontend:/baserow/web-frontend
@ -99,4 +99,4 @@ services:
tty: true
media-volume-fixer:
command: chown ${UID:-1000}:${GID:-1000} -R /baserow/media
command: chown ${UID:-1000}:${GID:-1000} -R /baserow/media