diff options
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | docker/app/alpine/3.6/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/app/alpine/3.7/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/app/stretch/3.6/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/app/stretch/3.7/Dockerfile | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/.dockerignore b/.dockerignore index d7c07a9a..991cbe37 100644 --- a/.dockerignore +++ b/.dockerignore @@ -31,7 +31,6 @@ manage.py pysite.egg-info README.md scripts -setup.py Vagrantfile venv wiki/migrations diff --git a/docker/app/alpine/3.6/Dockerfile b/docker/app/alpine/3.6/Dockerfile index 0dedd6da..c460815b 100644 --- a/docker/app/alpine/3.6/Dockerfile +++ b/docker/app/alpine/3.6/Dockerfile @@ -3,13 +3,12 @@ FROM python:3.6-alpine ARG EXTRAS=deploy # Build-time dependencies: To be removed later. -RUN apk add --no-cache --virtual build \ +RUN apk add --virtual build \ gcc \ - musl-dev \ - postgresql-dev + musl-dev -# Used by the healthcheck. -RUN apk add --no-cache curl +# Used by the healthcheck and shared library used by psycopg2. +RUN apk add --no-cache curl postgresql-dev WORKDIR /app COPY setup.py /app/setup.py diff --git a/docker/app/alpine/3.7/Dockerfile b/docker/app/alpine/3.7/Dockerfile index e7c8d696..83dbdb96 100644 --- a/docker/app/alpine/3.7/Dockerfile +++ b/docker/app/alpine/3.7/Dockerfile @@ -5,11 +5,10 @@ ARG EXTRAS=deploy # Build-time dependencies: To be removed later. RUN apk add --virtual build \ gcc \ - musl-dev \ - postgresql-dev + musl-dev -# Used by the healthcheck. -RUN apk add --no-cache curl +# Used by the healthcheck and shared library used by psycopg2. +RUN apk add --no-cache curl postgresql-dev WORKDIR /app COPY setup.py /app/setup.py diff --git a/docker/app/stretch/3.6/Dockerfile b/docker/app/stretch/3.6/Dockerfile index 19fe5918..a52317da 100644 --- a/docker/app/stretch/3.6/Dockerfile +++ b/docker/app/stretch/3.6/Dockerfile @@ -8,13 +8,14 @@ RUN apt-get install -y \ libc-dev \ libpq-dev - WORKDIR /app COPY setup.py /app/setup.py RUN python3 -m pip install .[$EXTRAS] COPY . . RUN apt-get purge -y \ - gcc + gcc \ + libc-dev \ + libpq-dev CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:application"] diff --git a/docker/app/stretch/3.7/Dockerfile b/docker/app/stretch/3.7/Dockerfile index 70d18dbc..1e832e32 100644 --- a/docker/app/stretch/3.7/Dockerfile +++ b/docker/app/stretch/3.7/Dockerfile @@ -14,6 +14,8 @@ RUN python3 -m pip install .[$EXTRAS] COPY . . RUN apt-get purge -y \ - gcc + gcc \ + libc-dev \ + libpq-dev CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:applicati |