Commit Graph

73 Commits (e3d97006a2e65058735843d97870c78ff6aa30a7)

Author SHA1 Message Date
Mikkel Ricky 2bfcda172d
Fix documentation URL (#33728) 1 month ago
Claire 0aa9bb8130
Bump version to v4.4.0-alpha.2 (#33615) 1 month ago
Noel De Martin 5c4e224b66
Comment sidekiq build in docker compose (#33483) 2 months ago
Claire ab133c5e30
Bump version to v4.3.2 (#33226) 3 months ago
Claire e97f4b18ad
Update changelog and docker tags to v4.3.1 (#32849) 4 months ago
Claire c3a38c7d8c
Update changelog and security policy (#32300) 5 months ago
Claire 03210085b7
Bump version to 4.3.0-rc.1 (#32124) 5 months ago
Claire 3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 5 months ago
Renaud Chaput 04f0468016
Fix streaming image with Docker Compose (#31615) 6 months ago
Renaud Chaput da42e9d446
Fix typo in Compose file (#31612) 6 months ago
Michael Stanclift 77c055b78c
Update Docker Compose for 4.3-beta (#31554) 6 months ago
Claire 1acbb628b9
Update changelog for v4.2.11 (#31452) 7 months ago
Claire df9e26158d
Bump version to v4.3.0-alpha.5 (#30920) 8 months ago
Matt Jankowski 569b7d2f25
Clarify the purpose of separate Docker resources (#30568) 9 months ago
Claire 7f808ff6e9
Bump version to v4.3.0-alpha.4 (#30482) 9 months ago
Shlee b8f0a50435
docker-compose.yml `version` is obsolete (#30120) 10 months ago
Claire 5f21a1f5a3
Bump version to v4.3.0-alpha.3 (#29241) 1 year ago
Michael Stanclift 272592d16d
Change startup command for Puma in Docker Compose (#28138) 1 year ago
Jeong Arm c0cda1adaf
Let use http_hidden_proxy on docker-compose (#27054) 1 year ago
Claire 4fcc026f0f
Bump version to v4.2.0 (#27017) 1 year ago
Claire 51768de16e
Bump version to v4.1.6 (#26272) 2 years ago
Claire f2c683336b
Bump version to v4.1.5 (#26108) 2 years ago
Renaud Chaput f9bdaebad2
Use Github Container Registry as the official container image source (#24113) 2 years ago
Shlee 159b4edeef
Update docker-compose.yml (#19063) 3 years ago
Shlee cc7cebb79a
Fix for #18637 - Migrate from elasticsearch-oss to elasticsearch basic (#18643)
* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
3 years ago
Markus Petzsch e3cebfa457
chore: bump elasticsearch version in docker-compose.yml file; closes #18189 (#18637) 3 years ago
Yamagishi Kazutoshi 584d8b977b
Format JSON and YAML using Prettier (#17823)
* Format JSON and YAML using Prettier

* Add prettier to devDep
3 years ago
Su Yang 10188c7db7
Add healthcheck for sidekiq (#17365) 3 years ago
Shlee ac8ad78e91
[Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable (#16947)
* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
3 years ago
Shlee bc348dbe94
[Dockerfile] Upgrade ElasticSearch-OSS 6.8.10 to 7.10.2 (#16956)
* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
3 years ago
Shlee a2ce7508c9
Update docker-compose.yml (#16489) 4 years ago
Shlee 91055f497f
Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016)
* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
5 years ago
Shlee 328c5a21d7
Update docker-compose.yml (#13756) 5 years ago
Matej Ľach 490ff09c5a
increase the postgres container shm_size from 64mb to 256mb (#13451) 5 years ago
Yamagishi Kazutoshi d7268befa8 Add healthcheck endpoint for web (#11770) 6 years ago
Eugen Rochko 15c7478c55
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 6 years ago
Eugen Rochko e7353c47db
Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302) 6 years ago
Shlee ab829d4aa8 Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 6 years ago
Fabian Schlenz 50b36ef59d Fixed Healthchecks in docker-compose.yml (#10553) 6 years ago
Sir-Boops 90398b9d00 Remove uneeded command and switch to images for TOR (#9438) 6 years ago
Ben Lubar 9b475a4838 Add healthcheck commands to docker-compose.yml (#9143)
This will allow Docker to be automatically check the health of services.

Docker won't do anything other than showing the state in the output of
"docker-compose ps" by default, but some management tools may watch for
container health events.

Here's what my local instance looks like right now:

          Name                        Command                  State                     Ports
-------------------------------------------------------------------------------------------------------------
mastodon_db_1              docker-entrypoint.sh postgres    Up (healthy)
mastodon_es_1              /usr/local/bin/docker-entr ...   Up (healthy)
mastodon_redis_1           docker-entrypoint.sh redis ...   Up (healthy)
mastodon_redis_cache_1     docker-entrypoint.sh redis ...   Up (healthy)
mastodon_sidekiq_1         /sbin/tini -- bundle exec  ...   Up             3000/tcp, 4000/tcp
mastodon_streaming_1       /sbin/tini -- yarn start         Up (healthy)   3000/tcp, 127.0.0.1:4000->4000/tcp
mastodon_web_1             /sbin/tini -- bash -c rm - ...   Up (healthy)   127.0.0.1:3000->3000/tcp, 4000/tcp
6 years ago
Eugen Rochko 969a10a5d1
Persist volumes by default in docker-compose (#9055)
Too many databases were lost to this
6 years ago
luzpaz 40dd19be37 Misc. typos (#8694)
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
7 years ago
ThibG fdda332e4d Update docker config and move some workers to different queues (#8345)
* Reorder docker-compose's sidekiq queues to match config/sidekiq.yml

* Make the ̀“mailers” queue higher priority than “pull”
7 years ago
Aaron Brady 8c279b1648 Update docker-compose to cope with build-time assets (#8156)
#7780 means that asset compilation happens as a build step.

Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).
7 years ago
MIYAGI Hikaru ddd0bb69e1 Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)
If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address.
I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.
7 years ago
J Yeary 905bd24788 TOR federation (#7875) 7 years ago
Isatis c7ac039697 Remove Puma pidfile before boot if container receives SIGTERM (#7052) 7 years ago
Valentin Lorentz 1e87ed44d5 docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138) 7 years ago
Eugen Rochko d7573fe584
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
7 years ago