diff options
| author | Benedikt Heine <bebe@bebehei.de> | 2018-07-17 09:07:03 +0200 |
|---|---|---|
| committer | Benedikt Heine <bebe@bebehei.de> | 2018-07-19 11:38:58 +0200 |
| commit | f1dd89fe8662be52bd4012b36b402f9380dac4e5 (patch) | |
| tree | cbaa31fd13a5dd8f18d00ee802fbc52a1ed95434 | |
| parent | [Docker] Build docker image via compose (diff) | |
| download | synapse-f1dd89fe8662be52bd4012b36b402f9380dac4e5.tar.xz | |
[Docker] Use sorted multiline package lists
This matches docker best practices. Signed-off-by: Benedikt Heine <bebe@bebehei.de>
| -rw-r--r-- | Dockerfile | 22 | ||||
| -rw-r--r-- | changelog.d/3543.misc | 1 |
2 files changed, 20 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 565341fee3..0242be5f68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,32 @@ FROM docker.io/python:2-alpine3.7 -RUN apk add --no-cache --virtual .nacl_deps su-exec build-base libffi-dev zlib-dev libressl-dev libjpeg-turbo-dev linux-headers postgresql-dev libxslt-dev +RUN apk add --no-cache --virtual .nacl_deps \ + build-base \ + libffi-dev \ + libjpeg-turbo-dev \ + libressl-dev \ + libxslt-dev \ + linux-headers \ + postgresql-dev \ + su-exec \ + zlib-dev COPY . /synapse # A wheel cache may be provided in ./cache for faster build RUN cd /synapse \ - && pip install --upgrade pip setuptools psycopg2 lxml \ + && pip install --upgrade \ + lxml \ + pip \ + psycopg2 \ + setuptools \ && mkdir -p /synapse/cache \ && pip install -f /synapse/cache --upgrade --process-dependency-links . \ && mv /synapse/contrib/docker/start.py /synapse/contrib/docker/conf / \ - && rm -rf setup.py setup.cfg synapse + && rm -rf \ + setup.cfg \ + setup.py \ + synapse VOLUME ["/data"] diff --git a/changelog.d/3543.misc b/changelog.d/3543.misc new file mode 100644 index 0000000000..d231d17749 --- /dev/null +++ b/changelog.d/3543.misc @@ -0,0 +1 @@ +Improve Dockerfile and docker-compose instructions |