Fix required changes
This commit is contained in:
parent
4099b039f5
commit
6e835a10e6
2 changed files with 8 additions and 7 deletions
13
Dockerfile
13
Dockerfile
|
@ -17,7 +17,7 @@ RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpa
|
||||||
ENV VIRTUAL_ENV=/venv
|
ENV VIRTUAL_ENV=/venv
|
||||||
|
|
||||||
# Use production configuration.
|
# Use production configuration.
|
||||||
ENV DJANGO_SETTINGS_MODULE=project.settings
|
ENV DJANGO_SETTINGS_MODULE=publichealth.settings
|
||||||
ENV DJANGO_CONFIGURATION=production
|
ENV DJANGO_CONFIGURATION=production
|
||||||
|
|
||||||
|
|
||||||
|
@ -29,13 +29,14 @@ ENV \
|
||||||
# pip:
|
# pip:
|
||||||
PIP_NO_CACHE_DIR=off \
|
PIP_NO_CACHE_DIR=off \
|
||||||
PIP_DISABLE_PIP_VERSION_CHECK=on \
|
PIP_DISABLE_PIP_VERSION_CHECK=on \
|
||||||
PIP_DEFAULT_TIMEOUT=100 \
|
PIP_DEFAULT_TIMEOUT=100
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get install -y --no-install-recommends build-essential gcc
|
RUN apt-get install -y --no-install-recommends build-essential gcc
|
||||||
|
|
||||||
# Install python build tools.
|
# Install python build tools.
|
||||||
RUN pip install --upgrade pip
|
RUN pip install --upgrade pip setuptools==58
|
||||||
RUN pip install poetry wheel
|
RUN pip install wheel
|
||||||
|
|
||||||
RUN python3 -m venv $VIRTUAL_ENV
|
RUN python3 -m venv $VIRTUAL_ENV
|
||||||
|
|
||||||
|
@ -57,7 +58,7 @@ COPY . /build
|
||||||
|
|
||||||
# Copy code required for runtime to the /app folder.
|
# Copy code required for runtime to the /app folder.
|
||||||
RUN mkdir /app
|
RUN mkdir /app
|
||||||
RUN cp -r apps project templates manage.py /app/
|
RUN cp -r publichealth yarn.lock manage.py /app/
|
||||||
|
|
||||||
# Collect static data into /app/static.
|
# Collect static data into /app/static.
|
||||||
RUN . /venv/bin/activate && \
|
RUN . /venv/bin/activate && \
|
||||||
|
@ -85,4 +86,4 @@ ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
|
||||||
"--log-file=-", \
|
"--log-file=-", \
|
||||||
"--worker-tmp-dir", "/dev/shm", \
|
"--worker-tmp-dir", "/dev/shm", \
|
||||||
"--workers=2", "--threads=4", "--worker-class=gthread"]
|
"--workers=2", "--threads=4", "--worker-class=gthread"]
|
||||||
CMD ["project.wsgi"]
|
CMD ["publichealth.wsgi"]
|
||||||
|
|
|
@ -30,5 +30,5 @@ Pillow==8.4.0
|
||||||
gunicorn
|
gunicorn
|
||||||
whitenoise
|
whitenoise
|
||||||
python-dotenv
|
python-dotenv
|
||||||
ConcurrentLogHandler
|
#ConcurrentLogHandler
|
||||||
unidecode
|
unidecode
|
||||||
|
|
Loading…
Reference in a new issue