Fix container startup (#2110)

* Fix container startup

* Fix env_replace to prevent overwriting existing environment variables

* Change path of default env files in entrypoint.sh

* Add common.ini generation to entrypoint.sh

* Remove main command from entrypoint.sh and use Dockerfile CMD

* Add logging to debug tests

* Add logging to debug tests

* Add logging to debug tests

* Add logging to debug tests

* Make the override of environment variable a parameter of env_replace script

Author: Panikabor

.gitignore

@@ -21,3 +21,4 @@ config/docker
 .coverage
 coverage.xml
 /config/env.local
+project.tar

docker/Dockerfile

@@ -36,4 +36,6 @@ RUN chown -R root:root /var/www \
  && pip install .
 
 EXPOSE 8080
+ENTRYPOINT ["./docker/scripts/entrypoint.sh"]
+
 CMD ["gunicorn", "--paste", "production.ini", "-u", "www-data", "-g", "www-data", "-b", ":8080"]

docker/scripts/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+./scripts/env_replace config/env.default --keep-env .env < production.ini.in > production.ini
+./scripts/env_replace config/env.default --keep-env .env < common.ini.in > common.ini
+
+exec "$@"

scripts/env_replace

@@ -4,14 +4,19 @@ import sys
 from dotenv import load_dotenv
 
 if __name__ == "__main__":
+    override_env = True
+    if "--keep-env" in sys.argv:
+        override_env = False
+        sys.argv.remove("--keep-env")
+
     if len(sys.argv) < 2:
-        print("Usage: {} env_file1 env_file2 ...".format(sys.argv[0]))
+        print("Usage: {} [--override-env] env_file1 env_file2 ...".format(sys.argv[0]))
         sys.exit(1)
 
     env_files = sys.argv[1:]
 
     for env_file in env_files:
-        load_dotenv(env_file, override=True)
+        load_dotenv(env_file, override=override_env)
 
     env = dict(**os.environ)
     # Because on Windows, environment variables are upper cased by default