mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-02-02 15:31:40 +01:00
Code Issues Projects Releases Wiki Activity
18,139 Commits 135 Branches 272 Tags
Commit Graph

73 Commits

Author SHA1 Message Date
Mikkel Ricky
2bfcda172d
Fix documentation URL (#33728) 2025-01-27 08:23:53 +00:00
Claire
0aa9bb8130
Bump version to v4.4.0-alpha.2 (#33615) 2025-01-16 11:02:54 +00:00
Noel De Martin
5c4e224b66
Comment sidekiq build in docker compose (#33483) 2025-01-07 15:40:24 +00:00
Claire
ab133c5e30
Bump version to v4.3.2 (#33226) 2024-12-09 09:09:00 +00:00
Claire
e97f4b18ad
Update changelog and docker tags to v4.3.1 (#32849) 2024-11-12 08:54:18 +00:00
Claire
c3a38c7d8c
Update changelog and security policy (#32300) 2024-10-08 12:24:59 +00:00
Claire
03210085b7
Bump version to 4.3.0-rc.1 (#32124) 2024-09-30 10:42:59 +00:00
Claire
3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
Renaud Chaput
04f0468016
Fix streaming image with Docker Compose (#31615) 2024-08-27 16:05:19 +00:00
Renaud Chaput
da42e9d446
Fix typo in Compose file (#31612) 2024-08-27 12:51:34 +00:00
Michael Stanclift
77c055b78c
Update Docker Compose for 4.3-beta (#31554) 2024-08-23 16:00:07 +00:00
Claire
1acbb628b9
Update changelog for v4.2.11 (#31452) 2024-08-16 12:52:57 +00:00
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 (#30920) 2024-07-04 14:59:54 +00:00
Matt Jankowski
569b7d2f25
Clarify the purpose of separate Docker resources (#30568) 2024-06-05 23:54:59 +00:00
Claire
7f808ff6e9
Bump version to v4.3.0-alpha.4 (#30482) 2024-05-30 13:34:46 +00:00
Shlee
b8f0a50435
docker-compose.yml version is obsolete (#30120) 2024-04-29 17:31:14 +00:00
Claire
5f21a1f5a3
Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 11:06:47 +00:00
Michael Stanclift
272592d16d
Change startup command for Puma in Docker Compose (#28138) 2023-12-01 11:06:37 +00:00
Jeong Arm
c0cda1adaf
Let use http_hidden_proxy on docker-compose (#27054) 2023-10-17 15:24:45 +02:00
Claire
4fcc026f0f
Bump version to v4.2.0 (#27017) 2023-09-21 16:51:32 +02:00
Claire
51768de16e
Bump version to v4.1.6 (#26272) 2023-07-31 21:11:25 +02:00
Claire
f2c683336b
Bump version to v4.1.5 (#26108) 2023-07-21 21:23:14 +02:00
Renaud Chaput
f9bdaebad2
Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01: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