diff options
| author | Brendan Abolivier <contact@brendanabolivier.com> | 2018-11-23 10:06:28 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-02-13 15:16:02 +0000 |
| commit | 72779ec93fe18d4b240f52f67c406eb7563134c4 (patch) | |
| tree | 86b0fbe74adb56bbcfa796db45179aa0d62770a5 | |
| parent | Make the Docker image run both synapse and the proxy (diff) | |
| download | synapse-72779ec93fe18d4b240f52f67c406eb7563134c4.tar.xz | |
Start synapse + proxy in the same container
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/proxy/proxy | bin | 5879664 -> 5875600 bytes | |||
| -rw-r--r-- | docker/supervisord.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index be59c3a4a7..b900e46864 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -78,8 +78,8 @@ RUN pip install flask COPY --from=builder /install /usr/local COPY ./docker/start.py /start.py COPY ./docker/conf /conf -COPY ./docker/proxy/proxy /proxy -COPY ./docker/proxy/maps /maps +COPY ./docker/proxy/proxy /proxy/proxy +COPY ./docker/proxy/maps /proxy/maps COPY ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf VOLUME ["/data"] diff --git a/docker/proxy/proxy b/docker/proxy/proxy index 17361fe726..20e618af25 100755 --- a/docker/proxy/proxy +++ b/docker/proxy/proxy Binary files differdiff --git a/docker/supervisord.conf b/docker/supervisord.conf index a37bbaf9b4..b0b2a8fa1f 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -5,4 +5,4 @@ nodaemon=true command=/start.py [program:proxy] -command=/proxy +command=/proxy/proxy |