Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into develop | Patrick Cloke | 2020-05-19 | 1 | -7/+8 |
|\ | |||||
| * | update dh-virtualenv (#7526) | Richard van der Hoff | 2020-05-19 | 1 | -7/+8 |
| | | |||||
* | | Update runtime docker image to Alpine v3.11 | Cédric Laubacher | 2020-05-03 | 1 | -1/+1 |
|/ | |||||
* | Kill off deprecated "config-on-the-fly" docker mode (#6918) | Richard van der Hoff | 2020-02-18 | 2 | -40/+32 |
| | | | | | Lots of people seem to get confused by this mode, and it's been deprecated since Synapse 1.1.0. It's time for it to go. | ||||
* | bump the version of Alpine Linux used in the docker images (#6897) | Richard van der Hoff | 2020-02-12 | 1 | -1/+1 |
| | |||||
* | Add working build command for docker image (#6390) | Andrew Morgan | 2019-11-23 | 1 | -0/+12 |
| | | | | | | * Add working build command for docker image * Add changelog | ||||
* | Docker: Change permissions for data dir before attempting to write to it (#6389) | Andrew Morgan | 2019-11-20 | 1 | -3/+3 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-10-31 | 1 | -2/+3 |
|\ | |||||
| * | Clarify environment variable usage when running in Docker (#6181) | Anton Lazarev | 2019-10-30 | 1 | -2/+3 |
| | | |||||
* | | Fix broken URL in docker/README.md (#6264) | Tobia De Koninck | 2019-10-28 | 1 | -1/+1 |
|/ | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com> | ||||
* | Fix logging config for the docker image (#6197) | Richard van der Hoff | 2019-10-18 | 1 | -0/+2 |
| | | | | | | | | Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194. | ||||
* | Docker: support SYNAPSE_WORKER envvar (#6058) | Michael Kaye | 2019-09-19 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | * Allow passing SYNAPSE_WORKER envvar * changelog.d * Document SYNAPSE_WORKER. Attempting to imply that you don't need to change this default unless you're in worker mode. Also aware that there's a bigger problem of attempting to document a complete working configuration of workers using docker, as we currently only document to use `synctl` for worker mode, and synctl doesn't work that way in docker. | ||||
* | Docker packaging should not su-exec or chmod if already running as UID/GID ↵ | Michael Kaye | 2019-09-03 | 1 | -35/+49 |
| | | | | | | | | (#5970) Adjust su-exec to only be used if needed. If UID == getuid() and GID == getgid() then we do not need to su-exec, and chmod will not work. | ||||
* | Typographical corrections in docker/README (#5921) | Victor Goff | 2019-08-28 | 1 | -5/+5 |
| | |||||
* | Fix debian packages for sid being called buster. (#5775) | Erik Johnston | 2019-07-30 | 2 | -1/+7 |
| | | | | | | | | | | * Fix debian packages for sid being called buster. I don't know why the sid images return buster as its codename in `lsb_release` but it does, so lets just grab the codename from the distro we pass into dockerfile * Newsfile | ||||
* | Improve `Depends` specs in debian package. (#5675) | Richard van der Hoff | 2019-07-17 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | This is basically a contrived way of adding a `Recommends` on `libpq5`, to fix #5653. The way this is supposed to happen in debhelper is to run `dh_shlibdeps`, which in turn runs `dpkg-shlibdeps`, which spits things out into `debian/<package>.substvars` whence they can later be included by `control`. Previously, we had disabled `dh_shlibdeps`, mostly because `dpkg-shlibdeps` gets confused about PIL's interdependent objects, but that's not really the right thing to do and there is another way to work around that. Since we don't always use postgres, we don't necessarily want a hard Depends on libpq5, so I've actually ended up adding an explicit invocation of `dpkg-shlibdeps` for `psycopg2`. I've also updated the build-depends list for the package, which was missing a couple of entries. | ||||
* | Add missing space in default logging file format generated by the Docker ↵ | Slavi Pantaleev | 2019-07-12 | 1 | -1/+1 |
| | | | | | | | image (#5620) This adds a missing space, without which log lines appear uglier. Signed-off-by: Slavi Pantaleev <slavi@devture.com> | ||||
* | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619) | Slavi Pantaleev | 2019-07-12 | 1 | -2/+2 |
| | | | | | | | | | Alpine Linux 3.8 is still supported, but it seems like it's quite outdated now. While Python should be the same on both, all other libraries, etc., are much newer in Alpine 3.9 and 3.10. Signed-off-by: Slavi Pantaleev <slavi@devture.com> | ||||
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 1 | -1/+1 |
| | |||||
* | Remove SMTP_* env var functionality from docker conf (#5596) | Andrew Morgan | 2019-07-03 | 1 | -19/+0 |
| | | | | | Removes any `SMTP_*` docker container environment variables from having any effect on the default config. Fixes https://github.com/matrix-org/synapse/issues/5430 | ||||
* | Add ability to set timezone for Docker container (#5383) | Amir Zarrinkafsh | 2019-07-02 | 2 | -1/+2 |
| | | | | Signed-off-by: Amir Zarrinkafsh <nightah@me.com> | ||||
* | Docker image: Add a migrate_config mode (#5567) | Richard van der Hoff | 2019-06-27 | 3 | -17/+57 |
| | | | ... to help people escape env var hell | ||||
* | Docker image: open the non-TLS port by default. (#5568) | Richard van der Hoff | 2019-06-27 | 1 | -0/+1 |
| | | | There's not much point in binding to localhost when it's in a docker container. | ||||
* | Deprecate the env var way of running the docker image (#5566) | Richard van der Hoff | 2019-06-27 | 2 | -154/+94 |
| | | | | | This is mostly a documentation change, but also adds a default value for SYNAPSE_CONFIG_PATH, so that running from the generated config is the default, and will Just Work provided your config is in the right place. | ||||
* | Merge pull request #5565 from matrix-org/rav/docker/fix_log_config | Richard van der Hoff | 2019-06-27 | 2 | -1/+13 |
|\ | | | | | Docker: generate our own log config | ||||
| * | Docker: generate our own log config | Richard van der Hoff | 2019-06-26 | 1 | -1/+8 |
| | | | | | | | | | | | | When running under docker, we want to use docker's own logging stuff rather than losing the logs somewhere on the container's filesystem, so let's use log configs that spit logs out to stdout instead. | ||||
| * | Add support for SYNAPSE_CONFIG_DIR | Richard van der Hoff | 2019-06-26 | 2 | -0/+5 |
| | | |||||
* | | Merge pull request #5563 from matrix-org/rav/docker/data_dir | Richard van der Hoff | 2019-06-27 | 2 | -4/+24 |
|\| | | | | | Docker image: add support for SYNAPSE_DATA_DIR parameter | ||||
| * | Docker image: add support for SYNAPSE_DATA_DIR parameter | Richard van der Hoff | 2019-06-26 | 2 | -4/+17 |
| | | | | | | | | Fixes #4830. | ||||
| * | document supported env vars for docker 'generate' option | Richard van der Hoff | 2019-06-26 | 1 | -0/+7 |
| | | |||||
* | | Docker: only run --generate-keys when generating config on-the-fly. | Richard van der Hoff | 2019-06-26 | 1 | -7/+21 |
| | | | | | | | | | | | | | | | | | | We don't want to generate any missing configs when running from a precanned config. (There's a strong argument that we don't want to do this at all, since generating a new signing key on each invocation sounds disasterous, but I don't fancy unpicking that for now.) | ||||
* | | improve logging for generate_config_from_template | Richard van der Hoff | 2019-06-26 | 1 | -1/+2 |
|/ | |||||
* | isort | Richard van der Hoff | 2019-06-25 | 1 | -4/+5 |
| | |||||
* | Add a main() function | Richard van der Hoff | 2019-06-25 | 1 | -8/+11 |
| | |||||
* | Factor out a run_generate_config function | Richard van der Hoff | 2019-06-25 | 1 | -17/+28 |
| | |||||
* | Factor out "generate_config_from_template" | Richard van der Hoff | 2019-06-25 | 1 | -41/+81 |
| | | | | ... and inline generate_secrets | ||||
* | Increase default log level for docker image to INFO. (#5547) | Richard van der Hoff | 2019-06-25 | 1 | -5/+2 |
| | | | Fixes #3370. | ||||
* | Update docker image to use Python 3.7. (#5546) | Richard van der Hoff | 2019-06-25 | 1 | -1/+1 |
| | | | Python 3.7 is apparently faster than 3.6, and should be mature enough. | ||||
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 1 | -19/+39 |
| | |||||
* | Include xmlsec in the docker image | Richard van der Hoff | 2019-06-18 | 1 | -1/+3 |
| | | | | Fixes #5467. | ||||
* | Remove Postgres 9.4 support (#5448) | Amber Brown | 2019-06-18 | 2 | -3/+3 |
| | |||||
* | Change to absolute path for contrib/docker | Neil Johnson | 2019-06-13 | 1 | -1/+1 |
| | | | because this file is reproduced on dockerhub and relative paths don't work | ||||
* | Update README.md (#5222) | Steffen | 2019-05-22 | 1 | -1/+1 |
| | | | Add missing backslash | ||||
* | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-03 | 1 | -1/+2 |
|\ | |||||
| * | Debian: we now need libpq-dev. | Richard van der Hoff | 2019-05-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | psycopg 2.8 is now out, which means that the C library gets built from source, so we now need libpq-dev when building. Turns out the need for this package is already documented in docs/postgres.rst. | ||||
* | | Fix handling of SYNAPSE_NO_TLS in docker image (#5005) | *=0=1=4=* | 2019-04-25 | 2 | -2/+15 |
| | | |||||
* | | Add systemd-python to optional dependencies (#4339) | Silke Hofstra | 2019-04-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | Using systemd-python allows for logging to the systemd journal, as is documented in: `synapse/contrib/systemd/log_config.yaml`. Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
* | | Correct default POSTGRES_USER in Docker README (#4987) | *=0=1=4=* | 2019-04-04 | 1 | -2/+3 |
| | | | | | | Correct default POSTGRES_USER in Docker README | ||||
* | | Add -p argument for docker run command example | Jurrie Overgoor | 2019-03-29 | 1 | -0/+1 |
| | | | | | | Signed-off-by: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com> | ||||
* | | Fix typo in TLS filenames | Jurrie Overgoor | 2019-03-29 | 1 | -2/+2 |
|/ | | | Signed-off-by: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com> | ||||
* | Document the `generate` option for the docker image. | Richard van der Hoff | 2019-03-07 | 1 | -4/+37 |
| | |||||
* | Fix debian build dockerfile github/release-v0.99.1 release-v0.99.1 | Richard van der Hoff | 2019-02-14 | 1 | -1/+5 |
| | | | | Make sure it refreshes the apt cache before trying to install stuff | ||||
* | Remove redundant entries from docker config | Richard van der Hoff | 2019-02-11 | 2 | -24/+1 |
| | | | | | * no_tls is now redundant (#4613) * we don't need a dummy cert any more (#4618) | ||||
* | Enable ACME support in the docker image (#4566) | Richard van der Hoff | 2019-02-05 | 5 | -41/+115 |
| | | | | | | | Also: * Fix wrapping in docker readme * Clean up some docs on the docker image * a workaround for #4554 | ||||
* | Docker: only copy what we need to the build image (#4562) | Richard van der Hoff | 2019-02-05 | 1 | -1/+4 |
| | | | | | | | | | | 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. | ||||
* | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 1 | -1/+0 |
| | | | * remove dh_params and set better cipher string | ||||
* | Rewrite build_debian_packages github/release-v0.34.1.1 release-v0.34.1.1 | Richard van der Hoff | 2019-01-12 | 1 | -46/+0 |
| | | | | Rewrite this in python so that it can be run in parallel. | ||||
* | fix docker build to install optional deps github/release-v0.34.1 release-v0.34.1 | Richard van der Hoff | 2019-01-09 | 1 | -3/+1 |
| | |||||
* | Install the optional dependencies into the debian package (#4325) | Richard van der Hoff | 2019-01-02 | 2 | -18/+33 |
| | | | | | | | | since #4298, the optional dependencies are no longer installed with a simple `pip install .`, which meant that they were not being included in the debian package. The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv 1.1... | ||||
* | buster is a thing | Richard van der Hoff | 2018-12-20 | 1 | -1/+8 |
| | |||||
* | Debian packaging via dh_virtualenv (#4285) | Richard van der Hoff | 2018-12-20 | 3 | -0/+115 |
| | |||||
* | Remove obsolete settings from docker homeserver.yaml | Richard van der Hoff | 2018-12-04 | 1 | -3/+1 |
| | | | | These aren't used, because we have a `log_config` setting. | ||||
* | Remove riot.im from the list of trusted Identity Servers in the default ↵ | Neil Johnson | 2018-11-20 | 1 | -1/+3 |
| | | | | configuration (#4207) | ||||
* | Make Docker image listening on ipv6 as well as ipv4 | Cédric Laudrel | 2018-10-25 | 1 | -2/+2 |
| | | | | Signed-off-by: Cédric Laudrel <dek@iono.me> | ||||
* | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 1 | -1/+3 |
| | | | | | | | | | | move the example email templates into the synapse package so that they can be used as package data, which should mean that all of the packaging mechanisms (pip, docker, debian, arch, etc) should now come with the example templates. In order to grandfather in people who relied on the templates being in the old place, check for that situation and fall back to using the defaults if the templates directory does not exist. | ||||
* | Further reduce the size of the docker image (#3972) | Richard van der Hoff | 2018-10-01 | 1 | -25/+46 |
| | | | | Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need. | ||||
* | Update Dockerfile | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| | |||||
* | make python 3 work in the docker container | Jan Christian Grünhage | 2018-09-20 | 2 | -2/+5 |
| | |||||
* | Add a way to run tests in PostgreSQL in Docker (#3699) | Amber Brown | 2018-09-20 | 2 | -0/+32 |
| | |||||
* | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable. | Simon Dwyer | 2018-09-16 | 1 | -1/+1 |
| | |||||
* | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable. | Simon Dwyer | 2018-09-16 | 1 | -0/+1 |
| | |||||
* | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M" | Simon Dwyer | 2018-09-16 | 1 | -1/+1 |
| | |||||
* | add runtime dependencies | Jan Christian Grünhage | 2018-09-10 | 1 | -5/+10 |
| | |||||
* | Move COPY before RUN and merge RUNs | Mathijs van Gorcum | 2018-09-10 | 1 | -5/+5 |
| | |||||
* | Remove build requirements after building | Mathijs van Gorcum | 2018-09-10 | 1 | -2/+3 |
| | |||||
* | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 1 | -1/+1 |
| | |||||
* | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 |
| | | | Link to contrib/docker | ||||
* | Address SPAG issues | Michael Kaye | 2018-08-02 | 1 | -2/+4 |
| | |||||
* | Refactor docker locations and README. | Michael Kaye | 2018-08-02 | 5 | -0/+471 |
This addresses #3224 |