Commit graph

72 commits

Author SHA1 Message Date
asonix 93c5b81807 Merge pull request 'v4.2.2' (#49) from asonix/changes into asonix/downstream
Reviewed-on: #49
2023-12-04 19:33:41 +00:00
Claire 4b8fe9df73 Bump version to v4.2.2 2023-12-04 15:28:15 +01:00
asonix 2012081e52 Merge pull request 'v4.2.1' (#44) from asonix/changes into asonix/downstream
Reviewed-on: #44
2023-10-11 17:21:26 +00:00
Claire 790fd1374f Bump version to v4.2.1 2023-10-10 13:52:41 +02:00
asonix 51d7132aed Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 14:15:29 -05:00
Claire 4fcc026f0f
Bump version to v4.2.0 (#27017) 2023-09-21 16:51:32 +02:00
asonix 8f373391b0 Merge pull request 'v4.1.9' (#38) from asonix/changes into asonix/downstream
Reviewed-on: #38
2023-09-20 16:21:36 +00:00
Claire e4c0aaf626
Bump version to v4.1.9 (#26997) 2023-09-20 17:25:05 +02:00
asonix 7dfe02d92e Merge pull request 'v4.1.8' (#35) from asonix/changes into asonix/downstream
Reviewed-on: #35
2023-09-19 15:28:24 +00:00
Claire 46bd58f74d Bump version to v4.1.8 2023-09-19 17:01:44 +02:00
asonix 518aa0c2ef Merge pull request 'v4.1.7' (#32) from asonix/changes into asonix/downstream
Reviewed-on: #32
2023-09-05 20:07:08 +00:00
Claire 5f88a2d70b Bump version to v4.1.7 2023-09-05 19:16:09 +02:00
Claire 51768de16e
Bump version to v4.1.6 (#26272) 2023-07-31 21:11:25 +02:00
asonix 4d7ba6f50f Merge pull request 'v4.1.6' (#29) from asonix/changes into asonix/downstream
Reviewed-on: #29
2023-07-31 17:24:55 +00:00
Claire ac7d40b561 Bump version to v4.1.6 2023-07-31 14:33:06 +02:00
asonix 5b0913e630 Merge pull request 'v4.1.5' (#26) from asonix/changes into asonix/downstream
Reviewed-on: #26
2023-07-23 23:37:37 +00:00
Claire f2c683336b
Bump version to v4.1.5 (#26108) 2023-07-21 21:23:14 +02:00
Claire ebf4f034c2 Bump version to v4.1.5 2023-07-21 16:07:43 +02:00
asonix 375a6ce6e9 Merge branch 'asonix/changes' into asonix/downstream 2023-04-06 15:58:11 -05:00
Renaud Chaput 4213907aaf Use Github Container Registry as the official container image source (#24113) 2023-03-16 11:44:11 +01:00
Renaud Chaput f9bdaebad2
Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01:00
asonix c699d525e7 Update docker stuff for testing 2022-12-20 19:32:34 -06:00
Shlee 159b4edeef
Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
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
2022-06-15 16:35:36 +02:00
Markus Petzsch e3cebfa457
chore: bump elasticsearch version in docker-compose.yml file; closes #18189 (#18637) 2022-06-11 15:34:58 +02:00
Yamagishi Kazutoshi 584d8b977b
Format JSON and YAML using Prettier (#17823)
* Format JSON and YAML using Prettier

* Add prettier to devDep
2022-03-21 04:46:11 +01:00
Su Yang 10188c7db7
Add healthcheck for sidekiq (#17365) 2022-01-26 18:08:49 +01:00
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
2021-11-18 22:00:27 +01:00
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
2021-11-18 21:59:34 +01:00
Shlee a2ce7508c9
Update docker-compose.yml (#16489) 2021-07-11 12:57:31 +02:00
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
2020-06-10 13:57:30 +02:00
Shlee 328c5a21d7
Update docker-compose.yml (#13756) 2020-05-15 11:38:30 +02:00
Matej Ľach 490ff09c5a
increase the postgres container shm_size from 64mb to 256mb (#13451) 2020-04-12 16:41:54 +02:00
Yamagishi Kazutoshi d7268befa8 Add healthcheck endpoint for web (#11770) 2019-09-07 02:47:51 +02:00
Eugen Rochko 15c7478c55
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 2019-07-18 20:28:05 +02:00
Eugen Rochko e7353c47db
Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302) 2019-07-15 05:56:35 +02:00
Shlee ab829d4aa8 Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 2019-05-19 11:29:26 +02:00
Fabian Schlenz 50b36ef59d Fixed Healthchecks in docker-compose.yml (#10553) 2019-04-23 00:54:26 +02:00
Sir-Boops 90398b9d00 Remove uneeded command and switch to images for TOR (#9438) 2019-01-04 16:15:09 +01:00
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
2018-12-29 00:43:41 +01:00
Eugen Rochko 969a10a5d1
Persist volumes by default in docker-compose (#9055)
Too many databases were lost to this
2018-10-23 00:08:25 +02:00
luzpaz 40dd19be37 Misc. typos (#8694)
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
2018-09-14 00:53:09 +02:00
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”
2018-09-02 16:13:06 +02:00
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).
2018-08-09 22:37:48 +02:00
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`.
2018-06-29 15:36:02 +02:00
J Yeary 905bd24788 TOR federation (#7875) 2018-06-26 20:34:12 +02:00
Isatis c7ac039697 Remove Puma pidfile before boot if container receives SIGTERM (#7052) 2018-05-25 18:50:31 +02:00
Valentin Lorentz 1e87ed44d5 docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138) 2018-04-15 13:57:58 +02:00
Eugen Rochko d7573fe584
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
2018-03-07 01:57:31 +01:00
Akihiko Odaki 81cefc1913 Do not use npm (#6656)
Both of yarn and npm are used in Mastodon, but the combined usage requires
a redundant dependency and may lead to data inconsistency.

Considering that yarn has autoclean feature which npm does not have,
this change replaces all npm usage with yarn.

This change requires documentation update. Most notably, the following
command must be executed before assets precompilation if any system
dependency of node-sass has changed:

yarn install --force --pure-lockfile
2018-03-06 21:36:46 +01:00