Commit Graph

821 Commits

Author SHA1 Message Date
Michele Locati
6a59e72bd5 README: SETTING_EMAIL_ instead of SETTINGS_EMAIL_ 2019-01-11 13:48:00 -08:00
Anders Kaseorg
2acd34b212 Add trailing newline to /etc/cron.d/autobackup.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-12 17:34:24 -08:00
Anders Kaseorg
fca0be8338 entrypoint.sh: Shell script cleanup; fix ShellCheck warnings.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-11 17:52:59 -08:00
Anders Kaseorg
b471a8271b Fix /etc/cron.d/autobackup.
The previous code wrote

    MAILTO=\n30 3 * * * cd /;/entrypoint.sh app:backup

(with a literal backslash n).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-11 17:26:54 -08:00
Anders Kaseorg
3772b29238 Increase zulip nofile limit to 40000 soft, 50000 hard.
To match zulip/puppet/zulip/files/limits.conf,
zulip/puppet/zulip/files/supervisor/supervisord.conf.  Otherwise we
inherit the Docker daemon’s limits, which are too small when Docker is
installed as a snap.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-04 17:27:26 -08:00
Anders Kaseorg
c8f5aa264d Run generate_secrets.py unconditionally.
We may need to populate newly added secrets when upgrading Zulip.

Fixes #163.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-04 13:21:51 -08:00
Harmen
2cef6c8a57 README: Fix typo. 2018-11-19 19:36:04 -08:00
Andrey L
dc556300be Fix typo in Docker image tag. 2018-11-12 10:29:40 -08:00
nil4
6b7fc12ac5 Fix 1.9.0-0 tag in upgrade instructions.
Fix Readme.md with the correct `docker pull` tag for 1.9.0-0.
2018-11-12 10:29:07 -08:00
Tim Abbott
f51944994f docker: Release 1.9.0-0. 1.9.0-0 2018-11-07 14:01:35 -08:00
Tim Abbott
b29da95039 README: Fix documentation for rotating postgres/rabbitmq passwords.
Apparently, it's kinda a pain to modify the passwords for
rabbitmq/postgres, so document that fact.

A nice v2 would be to link to docs for exactly how to rotate these
passwords.
2018-10-31 16:40:29 -07:00
Lưu Danh, Hiếu
4702b1aef2 Update README.md to fix "SETTINGS_" (should be "SETTING_").
This took me 30min ... "SETTINGS_EXTERNAL_HOST" is wrong, and will lead to problems. The correct one used in entrypoint.sh is "SETTING_EXTERNAL_HOST" with no 'S', same goes for other settings.
2018-10-18 16:07:44 -07:00
Tim Abbott
80e41d0ca5 docker: Release 1.9.0-rc2-0.
This includes a few recent fixes to the Docker image, as well as a
newer release candidate of Zulip itself.
1.9.0-rc2-0
2018-08-31 16:31:14 -07:00
Tim Abbott
a1ff3938ca entrypoint: Initialize settings.py files with the template.
This fixes a bug introduced in
62bf74190b, where the template
settings.py content wasn't being put in place properly.

The previous model meant that if the user exported the settings.py
file to the data directory, we'd end up appending various versions of
the users' configuration to it over time.

While those users should have been using the MANUAL_CONFIGURATION
setting, this at least is a much cleaner model for managing configuration.

Fixes #130.
Fixes #153.
Fixes #155.
2018-08-31 11:45:23 -07:00
xificurC
30f518c2ee Dockerfile: Install crudini.
The first container doesn't install it and fails when using the
CUSTOM_CA_CERTIFICATES environment variable.
2018-08-31 11:00:10 -07:00
Peter Nagy
0dc18f7ba2 README: Fix path to persistent data. 2018-08-30 11:10:18 -07:00
xificurC
edbc1522bd Dockerfile: Use bash in both stages of the Dockerfile. 2018-08-30 11:08:56 -07:00
Tim Abbott
4f9391becb docker: Release 1.9.0-rc1-2. 1.9.0-rc1-2 2018-08-27 11:58:03 -07:00
Tim Abbott
f874136af1 entrypoint: Remove references to ZULIP_AUTO_GENERATE_CERTS. 2018-08-23 13:30:42 -07:00
Tim Abbott
1190873d0f entrypoint: Remove unnecessary directory creation logging. 2018-08-23 13:16:56 -07:00
Tim Abbott
62bf74190b Dockerfile: Delete build-time settings and secrets files.
Since these files are intended to be automatically generated by
entrypoint.sh at container startup time, these files are at best
useless and at worst could result in users ending up with copies of
the secrets generated when the Docker image they were using was built.
2018-08-23 13:16:56 -07:00
Tim Abbott
f61b48b96f entrypoint: Remove obsolete RabbitMQ configuration.
The ignore option was removed a long time ago, and the settings style
variable for RabbitMQ is very old backwards-compatibility code that is
no longer needed.
2018-08-23 13:09:28 -07:00
Tim Abbott
b2bb979b4e yaml: Use single quotes in environment variables.
Single quotes in YAML have fewer situations where escaping is relevant
than double-quotes, which means using them as the default will help
prevent users from running into escaping issues.
2018-08-23 13:01:29 -07:00
Tim Abbott
78480d4de5 secrets: Use crudini to edit secrets file.
Using an actual tool designed to do this is a lot more robust and
fixes some nasty escaping issues involving secrets containing `~` that
were reported in #143.
2018-08-23 12:53:21 -07:00
Tim Abbott
2f23841919 docker: Release 1.9.0-rc1-1. 1.9.0-rc1-1 2018-08-23 12:17:13 -07:00
Tim Abbott
cebf5745e0 README: Document that we consider this project experimental. 2018-08-23 12:15:14 -07:00
xificurC
8b54088b72 docker: pull the images to avoid building Zulip on first try. 2018-08-13 15:50:00 -07:00
xificurC
ade00d5135 docker: Allow using a custom CA bundle for building the Zulip image. 2018-08-13 15:47:37 -07:00
Tim Abbott
081e64c46e entrypoint: Use extended globbing for integer detection.
This fixes #150, and should eliminate the possibility for future bugs
in the same vein.

I still want to eliminate this whole type-detection system, but that's
for future work.
2018-08-13 15:40:05 -07:00
Tim Abbott
b2f3ab2efc Use bash as the shell.
This in particular lets us set `-u pipefail` to have better error
handling.
2018-08-13 15:28:57 -07:00
Tim Abbott
3eca1ba1bf Migrate to zulip/docker-zulip Dockerhub project.
This migrates our documentation to point to the new official zulip
Docker repository on Dockerhub.
2018-08-09 19:06:21 -07:00
Tim Abbott
4b89ae5d77 docker: Upgrade docker-zulip to Zulip 1.9.0-rc1.
This docker image has only really supported Git leading up to Zulip
1.9 for a while now.  Now that there's a release candidate out, it
makes sense to declare that explicitly.

This commit will be tagged 1.9.0-rc1-0.
1.9.0-rc1-0
2018-08-09 17:27:06 -07:00
Tim Abbott
178ac3956a Dockerfile: Do an apt-get update before the upgrade.
The previous split interacted badly with caching if you reran the
build a few days after a previous build.
2018-08-09 17:27:06 -07:00
Tim Abbott
5daa7ba157 README: Document the DISABLE_HTTPS setting. 2018-08-03 15:27:48 -07:00
Tim Abbott
e879bc7821 docs: Add link to core Zulip reverse proxy documentation. 2018-08-03 15:23:26 -07:00
xificurC
71ac8fec01 Dockerfile: Ad -x to shell commands.
This makes `RUN` commands auto-print each shell command making it
easier to follow the build process.
2018-08-03 09:38:22 -07:00
xificurC
5583144c9d docker: change zulip ENVs to ARGs for easier updating.
This way, only the compose file needs to be touched which is more in
line with other configuration options.
2018-08-03 09:37:09 -07:00
Tim Abbott
f1196c80d8 rabbitmq: Configure the persistent storage volume.
The upstream rabbitmq project configures a persistent storage volume
(where data like the authentication details for the server are
stored), and it's a lot better for us to configure this explicitly, so
that all persistent state is stored in /opt/docker/zulip.
2018-08-02 10:15:59 -07:00
Tim Abbott
1e83a8c0a2 dependencies: Upgrade RabbitMQ dependency container.
The newer version has less messy console output spam.
2018-08-02 09:20:45 -07:00
jeaye
3b5d63b9ba setup: Add certbot support.
The task is to generate a self-signed cert so Zulip can be started, then
to wait until Zulip is up before using certbot to generate new certs.
Zulip needs to be up so it can meet certbot's challenge. Using a deploy
hook, certs are persisted in the data directory. The same applies to
renewal.

Tweaked by tabbott mostly to edit comments remove an unnecessary
setting before merging.

Fixes #120.
2018-07-23 22:29:10 -07:00
Jeaye Wilkerson
e8526c2208 Fix broken readme links, grammar, and formatting. 2018-07-23 09:22:52 -07:00
Sampriti Panda
d3c32ab0c1 Remove setup_files/ and related code from docker-compose.
This removes the fork of the core Zulip nginx configuration file that
we were maintaining in the docker-zulip project; doing so improves the
maintainability of this project for the future, since we don't need to
check on every Zulip upgrade whether we've made any changes to the
`nginx` package in zulip/zulip.

The only feature we were using that for was the DISABLE_HTTPS setting
in docker-zulip, and it's now possible to do that by editing
zulip.conf instead.

Fixes #114.
2018-07-10 12:22:41 +05:30
Sampriti Panda
de7b59b352 entrypoint: Add call to zulip-puppet-apply for nginx config.
First, we stop deleting the `puppet` directory, which is important for
being able to run `zulip-puppet-apply` inside the container (super
useful for debugging).

Second, we call this inside the code block for the `nginx` option, in
order to support the `DISABLE_HTTPS` option working without any copied
nginx configuration code in docker-zulip.

See #137 for how we could optimize this away.
2018-07-10 12:20:24 +05:30
Alexander Trost
2cfbee3110 docs: Add upgrade instructions for old postgres container.
Fixes #123

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
2018-07-10 12:20:11 +05:30
Alexander Trost
cc11dee79f Merge pull request #135 from sampritipanda/readme_update
README: Update repo link in installation instruction.
2018-07-09 16:28:05 +02:00
Sampriti Panda
f4ab43fc0c README: Update repo link in installation instruction. 2018-07-09 14:40:04 +05:30
Giora Guttsait
283c23fd0b Add AUTH_LDAP_CONNECTION_OPTIONS and organize conditions
fixes #127
2018-07-01 02:24:11 -07:00
Tim Abbott
fad2cf528b entrypoint: Fix writing to settings.py with MANUAL_CONFIGURATION.
The database configuration should not have been running in this
configuration model.
2018-05-31 09:14:26 -07:00
Tim Abbott
78840f4671 README: Add credits section thanking Alexander Trost. 2018-05-31 09:13:48 -07:00
Tim Abbott
ee0a7cb9ca Document how to enable the push notifications service. 2018-05-27 18:17:31 -07:00