From d576432e6145df464273f0f22d841cc9f5804b07 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Fri, 5 Apr 2019 20:59:22 +0100 Subject: Address review by @jchristgit --- docker/app/Dockerfile | 42 +++++++++++++++++++++++++++++++++++++++ docker/app/alpine/3.6/Dockerfile | 33 ------------------------------ docker/app/alpine/3.7/Dockerfile | 32 ----------------------------- docker/app/stretch/3.6/Dockerfile | 39 ------------------------------------ docker/app/stretch/3.7/Dockerfile | 39 ------------------------------------ docker/pysite.dockerapp | 2 +- 6 files changed, 43 insertions(+), 144 deletions(-) create mode 100644 docker/app/Dockerfile delete mode 100644 docker/app/alpine/3.6/Dockerfile delete mode 100644 docker/app/alpine/3.7/Dockerfile delete mode 100644 docker/app/stretch/3.6/Dockerfile delete mode 100644 docker/app/stretch/3.7/Dockerfile (limited to 'docker') diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile new file mode 100644 index 00000000..93d0c378 --- /dev/null +++ b/docker/app/Dockerfile @@ -0,0 +1,42 @@ +FROM bitnami/python:3.7-prod + +STOPSIGNAL SIGQUIT +ARG EXTRAS=deploy + +RUN adduser \ + --disabled-login \ + --no-create-home \ + --uid 1500 \ + pysite + +RUN apt-get update -y \ + && \ + apt-get install --no-install-recommends -y \ + gcc \ + libc-dev \ + libpq-dev \ + && \ + apt-get clean \ + && \ + rm -rf /var/lib/apt/lists/* + +WORKDIR /app + +COPY Pipfile Pipfile.lock /app/ + +RUN rm -r /opt/bitnami/python/lib/python3.*/site-packages/setuptools* && \ + pip install --no-cache-dir -U setuptools + +RUN python3 -m pip install pipenv \ + && python3 -m pipenv install --dev --system --deploy + +COPY . . + +RUN SECRET_KEY=placeholder DATABASE_URL=sqlite:// python3 manage.py collectstatic --no-input --clear --verbosity 0 + +RUN apt-get purge -y \ + gcc \ + libc-dev \ + libpq-dev + +CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/alpine/3.6/Dockerfile b/docker/app/alpine/3.6/Dockerfile deleted file mode 100644 index c40b6593..00000000 --- a/docker/app/alpine/3.6/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM python:3.6-alpine - -STOPSIGNAL SIGQUIT -ARG EXTRAS=deploy - -RUN adduser \ - -D \ - -H \ - -u 1500 \ - pysite - -RUN apk add --no-cache --virtual build \ - gcc \ - linux-headers \ - musl-dev \ - && \ - apk add --no-cache \ - curl \ - postgresql-dev - -WORKDIR /app - -COPY Pipfile /app/Pipfile -COPY Pipfile.lock /app/Pipfile.lock -RUN python3 -m pip install pipenv \ - && python3 -m pipenv install --dev --system --deploy \ - && apk del --purge build - -COPY . . - -RUN python3 manage.py collectstatic --no-input --clear - -CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/alpine/3.7/Dockerfile b/docker/app/alpine/3.7/Dockerfile deleted file mode 100644 index 9dfbfe09..00000000 --- a/docker/app/alpine/3.7/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM python:3.7-alpine - -STOPSIGNAL SIGQUIT - -RUN adduser \ - -D \ - -H \ - -u 1500 \ - pysite - -RUN apk add --no-cache --update --virtual build \ - gcc \ - linux-headers \ - musl-dev \ - && \ - apk add \ - curl \ - postgresql-dev - -WORKDIR /app - -COPY Pipfile /app/Pipfile -COPY Pipfile.lock /app/Pipfile.lock -RUN python3 -m pip install pipenv \ - && python3 -m pipenv install --dev --system --deploy \ - && apk del --purge build - -COPY . . - -RUN python3 manage.py collectstatic --no-input --clear - -CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/stretch/3.6/Dockerfile b/docker/app/stretch/3.6/Dockerfile deleted file mode 100644 index 5f97a510..00000000 --- a/docker/app/stretch/3.6/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM python:3.6-stretch - -STOPSIGNAL SIGQUIT -ARG EXTRAS=deploy - -RUN adduser \ - --disabled-login \ - --no-create-home \ - --uid 1500 \ - pysite - -RUN apt-get update -y \ - && \ - apt-get install --no-install-recommends -y \ - gcc \ - libc-dev \ - libpq-dev \ - && \ - apt-get clean \ - && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY Pipfile /app/Pipfile -COPY Pipfile.lock /app/Pipfile.lock -RUN python3 -m pip install pipenv \ - && python3 -m pipenv install --dev --system --deploy - -COPY . . - -RUN python3 manage.py collectstatic --no-input --clear - -RUN apt-get purge -y \ - gcc \ - libc-dev \ - libpq-dev - -CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/stretch/3.7/Dockerfile b/docker/app/stretch/3.7/Dockerfile deleted file mode 100644 index a1538ddd..00000000 --- a/docker/app/stretch/3.7/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM python:3.7-stretch - -STOPSIGNAL SIGQUIT -ARG EXTRAS=deploy - -RUN adduser \ - --disabled-login \ - --no-create-home \ - --uid 1500 \ - pysite - -RUN apt-get update -y \ - && \ - apt-get install --no-install-recommends -y \ - gcc \ - libc-dev \ - libpq-dev \ - && \ - apt-get clean \ - && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /app - -COPY Pipfile /app/Pipfile -COPY Pipfile.lock /app/Pipfile.lock -RUN python3 -m pip install pipenv \ - && python3 -m pipenv install --dev --system --deploy - -COPY . . - -RUN python3 manage.py collectstatic --no-input --clear - -RUN apt-get purge -y \ - gcc \ - libc-dev \ - libpq-dev - -CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/pysite.dockerapp b/docker/pysite.dockerapp index 738fcfdd..dc472b2e 100644 --- a/docker/pysite.dockerapp +++ b/docker/pysite.dockerapp @@ -1,5 +1,5 @@ version: 0.3.0 -name: pydis_site +name: pysite description: | Our community website, built on Django and PostgreSQL. namespace: python-discord -- cgit v1.2.3