From a72f9f41334e8c89ddf9617515cfb11c56eaaa37 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Thu, 14 Nov 2019 16:42:45 +0100
Subject: [PATCH] Fix variable.
---
docker-compose.yaml | 2 +-
docker/entrypoint.sh | 17 +++--------------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8b63ed21e..c0bdbbdd1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
environment:
- BISCUIT_http__allowed_hosts="['*']"
- BISCUIT_caching__memcached__address=memcached:11211
- - BISCUIT_databae__host=db
+ - BISCUIT_database__host=db
depends_on:
- db
- memcached
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 411fe1eca..59619b91d 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,16 +1,9 @@
#!/bin/bash
GUNICORN_BIND=${GUNICORN_BIND:-0.0.0.0:8000}
-POSTGRES_HOST=${POSTGRES_HOST:-127.0.0.1}
-POSTGRES_PORT=${POSTGRES_PORT:-5432}
-POSTGRES_DB=${POSTGRES_DB:-biscuit}
-POSTGRES_USER=${POSTGRES_USER:-biscuit}
-export BISCUIT_database__host=${BISCUIT_database__host:-$POSTGRES_HOST}
-export BISCUIT_database__port=${BISCUIT_database__port:-$POSTGRES_PORT}
-export BISCUIT_database__name=${BISCUIT_database__name:-$POSTGRES_DB}
-export BISCUIT_database__user=${BISCUIT_database__user:-$POSTGRES_USER}
-export BISCUIT_database__password=${BISCUIT_database__password:-$POSTGRES_PASSWORD}
+export BISCUIT_database__host=${BISCUIT_database__host:-127.0.0.1}
+export BISCUIT_database__port=${BISCUIT_database__port:-5432}
if [[ -z $BISCUIT_secret_key ]]; then
if [[ ! -e /etc/biscuit/secret_key ]]; then
@@ -27,8 +20,4 @@ done
python manage.py flush --no-input
python manage.py migrate
-if [[ -n "$@" ]]; then
- exec "$@"
-else
- exec gunicorn biscuit.core.wsgi --bind ${GUNICORN_BIND}
-fi
+exec gunicorn biscuit.core.wsgi --bind ${GUNICORN_BIND}
--
GitLab