diff --git a/docker-compose.yml b/docker-compose.yml index 0e771baed04ba1dd47a2977a94078f05875502f4..f13a4b3942587b6086bb93cc0124982c50089138 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,6 @@ services: - 80:80 environment: - ENV=dev - - DOMAIN=localhost - APP_NAME=Framadate - ADMIN_MAIL=mon@email.fr - MYSQL_USER=framadate diff --git a/docker/stretch/entrypoint.sh b/docker/stretch/entrypoint.sh index 01088d185cb53eaa3eac696ac3b3c38cd06a1b81..37b382bc856791001dbc53d42a244c612aa80044 100755 --- a/docker/stretch/entrypoint.sh +++ b/docker/stretch/entrypoint.sh @@ -19,9 +19,7 @@ if [ ! -f $FRAMADATE_CONFIG ]; then echo "There is no configuration file. Create one with environment variables" cp /var/www/framadate/tpl/admin/config.tpl $FRAMADATE_CONFIG # Set values on configuration file - if [ ! -z "$DOMAIN" ]; then - sed -i -E "s/^(\/\/ )?const APP_URL( )?=.*;/const APP_URL = '$DOMAIN';/g" $FRAMADATE_CONFIG - fi + sed -i -E "s/^(\/\/ )?const APP_URL( )?=.*;/const APP_URL = '$DOMAIN';/g" $FRAMADATE_CONFIG if [ "$FORCE_HTTPS" = true ]; then sed -i -E "s/^(\/\/ )?const FORCE_HTTPS\\s*=.*;/const FORCE_HTTPS = true;/" $FRAMADATE_CONFIG fi