From 9df2424c26d099192ae5776c5bd564dfa1b48b7f Mon Sep 17 00:00:00 2001 From: Aevann1 <59999695+Aevann1@users.noreply.github.com> Date: Tue, 3 Aug 2021 08:04:59 +0200 Subject: [PATCH 1/4] Update Dockerfile --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56f7fdf69..8e2d6169d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,10 @@ COPY supervisord.conf /etc/supervisord.conf RUN apt update \ && apt install -y python3.8 python3-pip supervisor -RUN mkdir -p /opt/Drama/service +RUN mkdir ./service -COPY requirements.txt /opt/Drama/service/requirements.txt - -RUN cd /opt/Drama/service \ - && pip3 install -r requirements.txt +RUN pip3 install -r requirements.txt \ + && cd ./service EXPOSE 80/tcp From c32f40975b563e611307b007884950ff9d0cc61a Mon Sep 17 00:00:00 2001 From: Aevann1 <59999695+Aevann1@users.noreply.github.com> Date: Tue, 3 Aug 2021 08:05:38 +0200 Subject: [PATCH 2/4] Update supervisord.conf --- supervisord.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supervisord.conf b/supervisord.conf index b4eae871d..b81a161d3 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -4,9 +4,9 @@ pidfile=/tmp/supervisord.pid logfile=/tmp/supervisord.log [program:dramaservice] -directory=/opt/Drama/service +directory=/d/service command=gunicorn drama.__main__:app -k gevent -w 5 --max-requests 10000 --max-requests-jitter 500 --reload --bind 0.0.0.0:80 stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 \ No newline at end of file +stderr_logfile_maxbytes=0 From 06dd896be8744f7ddfc2be610607a7e1a1158360 Mon Sep 17 00:00:00 2001 From: Aevann1 <59999695+Aevann1@users.noreply.github.com> Date: Tue, 3 Aug 2021 08:06:24 +0200 Subject: [PATCH 3/4] Update supervisord.conf --- supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisord.conf b/supervisord.conf index b81a161d3..e64eb1211 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -4,7 +4,7 @@ pidfile=/tmp/supervisord.pid logfile=/tmp/supervisord.log [program:dramaservice] -directory=/d/service +directory=/drama/service command=gunicorn drama.__main__:app -k gevent -w 5 --max-requests 10000 --max-requests-jitter 500 --reload --bind 0.0.0.0:80 stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 From 5dad83ed1c4f5b24f37433d616220cb8a21e6c95 Mon Sep 17 00:00:00 2001 From: Aevann1 <59999695+Aevann1@users.noreply.github.com> Date: Tue, 3 Aug 2021 08:07:20 +0200 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8e2d6169d..454f7019a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,11 @@ FROM ubuntu:20.04 COPY supervisord.conf /etc/supervisord.conf -RUN apt update \ - && apt install -y python3.8 python3-pip supervisor +RUN apt update \ && apt install -y python3.8 python3-pip supervisor RUN mkdir ./service -RUN pip3 install -r requirements.txt \ - && cd ./service +RUN pip3 install -r requirements.txt \ && cd ./service EXPOSE 80/tcp