diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..c1c9f4dc --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.git* diff --git a/dockerfiles/oj_web_server/run.sh b/dockerfiles/oj_web_server/run.sh index 86dfee81..2c65fdc5 100644 --- a/dockerfiles/oj_web_server/run.sh +++ b/dockerfiles/oj_web_server/run.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -if [ ! -f "/code/oj/custom_settings.py" ]; then - cp /code/oj/custom_settings.example.py /code/oj/custom_settings.py - echo "SECRET_KEY=\"`cat /dev/urandom | head -1 | md5sum | head -c 32`\"" >> /code/oj/custom_settings.py +if [ ! -f "/code/oj/secret_key.py" ]; then + echo "SECRET_KEY=\"`cat /dev/urandom | head -1 | md5sum | head -c 32`\"" >> /code/oj/secret_key.py fi ca_base_dir="/code/ssl" diff --git a/oj/secret_key.example.py b/oj/secret_key.example.py new file mode 100644 index 00000000..cfe94f90 --- /dev/null +++ b/oj/secret_key.example.py @@ -0,0 +1 @@ +SECRET_KEY="123456" diff --git a/oj/settings.py b/oj/settings.py index d1b5276d..e52963b9 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -23,6 +23,7 @@ elif ENV == "server": from .server_settings import * from .custom_settings import * +from .secret_key import * BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))