From 7bf1f8bfdee3e3a5434d050f29a9d46ec0a8c55d Mon Sep 17 00:00:00 2001 From: nanaones Date: Wed, 29 Jul 2020 21:27:00 +0900 Subject: [PATCH] chore: move docker folder to under /examples edit Dockerfile delete DEBIAN_FRONTEND argument edit install.sh System environment $REQUIRENMENTS_FILE_PATH was added When the user sets $REQUIRENMENTS_FILE_PATH, the container tries to install it as a pip requirements file --- {Docker => examples/docker}/Dockerfile | 7 ++----- {Docker => examples/docker}/README.md | 0 {Docker => examples/docker}/config/async-requirements.txt | 0 {Docker => examples/docker}/config/config.sh | 0 {Docker => examples/docker}/config/install.sh | 6 +++++- {Docker => examples/docker}/config/start.sh | 0 {Docker => examples/docker}/config/sync-requirements.txt | 0 7 files changed, 7 insertions(+), 6 deletions(-) rename {Docker => examples/docker}/Dockerfile (85%) rename {Docker => examples/docker}/README.md (100%) rename {Docker => examples/docker}/config/async-requirements.txt (100%) rename {Docker => examples/docker}/config/config.sh (100%) rename {Docker => examples/docker}/config/install.sh (66%) rename {Docker => examples/docker}/config/start.sh (100%) rename {Docker => examples/docker}/config/sync-requirements.txt (100%) diff --git a/Docker/Dockerfile b/examples/docker/Dockerfile similarity index 85% rename from Docker/Dockerfile rename to examples/docker/Dockerfile index 181b12735..35b94c7a6 100644 --- a/Docker/Dockerfile +++ b/examples/docker/Dockerfile @@ -1,17 +1,14 @@ FROM python:3.8.4-slim ENV PYTHONIOENCODING UTF-8 -ARG DEBIAN_FRONTEND=noninteractive - -COPY ./config /config - ENV CONFIG_FILE_PATH=/config/config.py ENV WORK_DIR=/work +WORKDIR /work +COPY config /config RUN chmod 777 /config/install.sh /config/start.sh /config/config.sh &&\ pip3 install -r /config/async-requirements.txt &&\ pip3 install -r /config/sync-requirements.txt &&\ /config/install.sh -WORKDIR /work ENTRYPOINT /config/start.sh diff --git a/Docker/README.md b/examples/docker/README.md similarity index 100% rename from Docker/README.md rename to examples/docker/README.md diff --git a/Docker/config/async-requirements.txt b/examples/docker/config/async-requirements.txt similarity index 100% rename from Docker/config/async-requirements.txt rename to examples/docker/config/async-requirements.txt diff --git a/Docker/config/config.sh b/examples/docker/config/config.sh similarity index 100% rename from Docker/config/config.sh rename to examples/docker/config/config.sh diff --git a/Docker/config/install.sh b/examples/docker/config/install.sh similarity index 66% rename from Docker/config/install.sh rename to examples/docker/config/install.sh index a0b14e233..e4d7119c6 100644 --- a/Docker/config/install.sh +++ b/examples/docker/config/install.sh @@ -4,4 +4,8 @@ if [ -n "$FRAMEWORK_VERSION" ] && [ -n "$FRAMEWORK" ]; then pip3 install "$FRAMEWORK"=="$FRAMEWORK_VERSION" elif [ -n "$FRAMEWORK" ]; then pip3 install "$FRAMEWORK" -fi \ No newline at end of file +fi + +if [ -n "$REQUIRENMENTS_FILE_PATH" ]; then + pip3 install -r "$REQUIRENMENTS_FILE_PATH" +fi diff --git a/Docker/config/start.sh b/examples/docker/config/start.sh similarity index 100% rename from Docker/config/start.sh rename to examples/docker/config/start.sh diff --git a/Docker/config/sync-requirements.txt b/examples/docker/config/sync-requirements.txt similarity index 100% rename from Docker/config/sync-requirements.txt rename to examples/docker/config/sync-requirements.txt