From 888d672ad685d64a833c1cb7faf5a5a6fe311e11 Mon Sep 17 00:00:00 2001 From: Johannes Christ Date: Mon, 17 Sep 2018 23:00:34 +0200 Subject: Use proper multiline installation. --- docker/app/alpine/3.6/Dockerfile | 17 +++++++++++++++-- docker/app/alpine/3.7/Dockerfile | 17 +++++++++++++++-- docker/app/stretch/3.6/Dockerfile | 4 ++-- docker/app/stretch/3.7/Dockerfile | 4 ++-- 4 files changed, 34 insertions(+), 8 deletions(-) (limited to 'docker') diff --git a/docker/app/alpine/3.6/Dockerfile b/docker/app/alpine/3.6/Dockerfile index c062ee8e..2819c8d6 100644 --- a/docker/app/alpine/3.6/Dockerfile +++ b/docker/app/alpine/3.6/Dockerfile @@ -2,12 +2,25 @@ FROM python:3.6-alpine ARG EXTRAS=deploy -RUN apk add git libpq postgresql-dev gcc cmake autoconf automake musl-dev +RUN apk add \ + autoconf \ + automake \ + cmake \ + gcc \ + git \ + libpq \ + musl-dev \ + postgresql-dev COPY . /app WORKDIR /app RUN python3 -m pip install .[$EXTRAS] -RUN apk del git gcc cmake autoconf automake +RUN apk del \ + autoconf \ + automake \ + cmake \ + gcc \ + git CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:applicati diff --git a/docker/app/alpine/3.7/Dockerfile b/docker/app/alpine/3.7/Dockerfile index 4583840b..f2c7bcdf 100644 --- a/docker/app/alpine/3.7/Dockerfile +++ b/docker/app/alpine/3.7/Dockerfile @@ -2,12 +2,25 @@ FROM python:3.7-alpine ARG EXTRAS=deploy -RUN apk add git libpq postgresql-dev gcc cmake autoconf automake musl-dev +RUN apk add \ + autoconf \ + automake \ + cmake \ + gcc \ + git \ + libpq \ + musl-dev \ + postgresql-dev COPY . /app WORKDIR /app RUN python3 -m pip install .[$EXTRAS] -RUN apk del git gcc cmake autoconf automake +RUN apk del \ + autoconf \ + automake \ + cmake \ + gcc \ + git CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:application"] diff --git a/docker/app/stretch/3.6/Dockerfile b/docker/app/stretch/3.6/Dockerfile index 4cabdbfa..46bc1247 100644 --- a/docker/app/stretch/3.6/Dockerfile +++ b/docker/app/stretch/3.6/Dockerfile @@ -9,8 +9,8 @@ RUN apt-get install -y \ cmake \ gcc \ git \ - libc-dev - libpq-dev \ + libc-dev \ + libpq-dev RUN python3 -m pip install .[$EXTRAS] diff --git a/docker/app/stretch/3.7/Dockerfile b/docker/app/stretch/3.7/Dockerfile index 32aee420..0290b800 100644 --- a/docker/app/stretch/3.7/Dockerfile +++ b/docker/app/stretch/3.7/Dockerfile @@ -9,8 +9,8 @@ RUN apt-get install -y \ cmake \ gcc \ git \ - libc-dev - libpq-dev \ + libc-dev \ + libpq-dev RUN python3 -m pip install .[$EXTRAS] -- cgit v1.2.3