Compare commits

..

No commits in common. "release" and "label_token_rebase" have entirely different histories.

2 changed files with 3 additions and 7 deletions

View file

@ -2,7 +2,6 @@ services:
idhub: idhub:
init: true init: true
image: farga.pangea.org/ereuse/idhub:latest
build: build:
context: . context: .
dockerfile: docker/idhub.Dockerfile dockerfile: docker/idhub.Dockerfile

View file

@ -17,10 +17,8 @@ END
inject_env_vars() { inject_env_vars() {
# related https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ # related https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/
if [ -d "${idhub_dir}/.git" ]; then
git config --global --add safe.directory "${idhub_dir}" git config --global --add safe.directory "${idhub_dir}"
export COMMIT="commit: $(git log --pretty=format:'%h' -n 1)" export COMMIT="commit: $(git log --pretty=format:'%h' -n 1)"
fi
cat > status_data <<END cat > status_data <<END
DOMAIN=${DOMAIN} DOMAIN=${DOMAIN}
@ -120,8 +118,7 @@ runserver() {
elif [ "${DEMO:-}" = 'true' ]; then elif [ "${DEMO:-}" = 'true' ]; then
VAULT_PASSWORD="DEMO" VAULT_PASSWORD="DEMO"
# open_service: automatically unlocks the vault, # open_service: automatically unlocks the vault,
# and runs the service # useful for debugging/dev purposes ./manage.py
# useful for debugging/dev/demo purposes ./manage.py
./manage.py open_service "${VAULT_PASSWORD}" 0.0.0.0:${PORT} ./manage.py open_service "${VAULT_PASSWORD}" 0.0.0.0:${PORT}
else else
./manage.py runserver 0.0.0.0:${PORT} ./manage.py runserver 0.0.0.0:${PORT}