summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-02-05 11:44:40 +0000
committerGitHub <noreply@github.com>2019-02-05 11:44:40 +0000
commit3ef71a6ea057c7ad8b87933f06861e9973660b51 (patch)
treef5556bb734dd7034b56b859380d6357c80fa63d4
parentFix default ACME config for py2 (#4564) (diff)
downloadsynapse-3ef71a6ea057c7ad8b87933f06861e9973660b51.tar.xz
Docker: only copy what we need to the build image (#4562)
There are two reasons this is a good thing:

 * first, it means that you don't end up with stuff kicking around your working
   copy ending up in the build image by mistake (which can upset the pip
   install process)

 * second: it means that the docker image cache is more effective, and we can
   reuse docker images when iterating on the docker stuff.
-rw-r--r--changelog.d/4562.misc1
-rw-r--r--docker/Dockerfile5
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/4562.misc b/changelog.d/4562.misc
new file mode 100644

index 0000000000..f7185fa768 --- /dev/null +++ b/changelog.d/4562.misc
@@ -0,0 +1 @@ +Docker: only copy what we need to the build image diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4b739e7d02..d212334844 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile
@@ -31,7 +31,10 @@ RUN pip install --prefix="/install" --no-warn-script-location \ # now install synapse and all of the python deps to /install. -COPY . /synapse +COPY synapse /synapse/synapse/ +COPY scripts /synapse/scripts/ +COPY MANIFEST.in README.rst setup.py synctl /synapse/ + RUN pip install --prefix="/install" --no-warn-script-location \ /synapse[all]