From 2eea07c85e0df0e973f13c7007a7b516f1ff1e3c Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 26 Jan 2022 20:05:52 +0700 Subject: [PATCH] organize docker conf files --- Dockerfile | 6 +++--- nginx.conf => docker_assets/nginx.conf | 0 run.sh => docker_assets/run.sh | 6 +++--- uwsgi.ini => docker_assets/uwsgi.ini | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename nginx.conf => docker_assets/nginx.conf (100%) rename run.sh => docker_assets/run.sh (95%) rename uwsgi.ini => docker_assets/uwsgi.ini (100%) diff --git a/Dockerfile b/Dockerfile index f196318..bc3f927 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,12 +35,12 @@ COPY ./tubearchivist/requirements.txt /requirements.txt RUN pip install --no-cache-dir -r requirements.txt --src /usr/local/src # copy config files -COPY nginx.conf /etc/nginx/conf.d/ +COPY docker_assets/nginx.conf /etc/nginx/conf.d/ # copy application into container COPY ./tubearchivist /app -COPY ./run.sh /app -COPY ./uwsgi.ini /app +COPY ./docker_assets/run.sh /app +COPY ./docker_assets/uwsgi.ini /app # volumes VOLUME /cache diff --git a/nginx.conf b/docker_assets/nginx.conf similarity index 100% rename from nginx.conf rename to docker_assets/nginx.conf diff --git a/run.sh b/docker_assets/run.sh similarity index 95% rename from run.sh rename to docker_assets/run.sh index 7f25cc9..235f823 100644 --- a/run.sh +++ b/docker_assets/run.sh @@ -2,9 +2,9 @@ # startup script inside the container for tubearchivist # check environment -if [[ -z "$DJANGO_DEBUG" ]]; then - export DJANGO_DEBUG=False -fi +# if [[ -z "$DJANGO_DEBUG" ]]; then +# export DJANGO_DEBUG=False +# fi if [[ -z "$ELASTIC_USER" ]]; then export ELASTIC_USER=elastic diff --git a/uwsgi.ini b/docker_assets/uwsgi.ini similarity index 100% rename from uwsgi.ini rename to docker_assets/uwsgi.ini