7516ace894
Merge remote-tracking branch 'localupstream/429' into deploy
2024-06-17 16:25:13 -07:00
Claire
c93aacafde
Bump version to v4.2.9 ( #30470 )
2024-05-30 15:34:50 +02:00
Claire
bdb6650ebc
Bump version to v4.2.8 ( #29370 )
2024-02-23 14:09:41 +01:00
Claire
0e4e98fad1
Bump version to v4.2.7
2024-02-16 11:57:02 +01:00
Claire
7c8ca0c6d6
Bump version to v4.2.6
2024-02-14 15:16:34 +01:00
a7d4b0d057
Update docker compose to stop using prebuilt images ugh
2024-02-01 15:27:51 -08:00
e252efd883
Merge remote-tracking branch 'localupstream/425' into deploy
2024-02-01 08:09:45 -08:00
ee75a41835
Merge remote-tracking branch 'localupstream/424' into deploy
2024-02-01 08:05:14 -08:00
Claire
a6641f828b
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to v4.2.5
2024-02-01 15:56:46 +01:00
Claire
4633bb8ce0
Bump version to v4.2.4
2024-01-24 15:31:13 +01:00
78bfcdc46a
Merge remote-tracking branch 'localupstream/423' into deploy
2023-12-22 11:04:09 -08:00
Claire
90371a4fc4
Bump version to v4.2.3
2023-12-05 15:35:05 +01:00
Claire
4b8fe9df73
Bump version to v4.2.2
2023-12-04 15:28:15 +01:00
bdf459b037
Merge branch '421' (upstream v4.2.1) into deploy
2023-10-10 19:32:55 -07:00
Claire
790fd1374f
Bump version to v4.2.1
2023-10-10 13:52:41 +02:00
01c44ef213
Fix broken merge conflicts from earlier
2023-09-22 10:17:44 -07:00
root
ad33983cfc
Update from live: sidekiq performance, prometheus mappings
2023-09-21 15:46:57 -07:00
c56ab06b89
Force mastodon_web to recompile its assets when it starts
2023-09-21 15:46:57 -07:00
5e798c6f35
Committing changes to docker-compose as reflected on the server
2023-09-21 15:46:56 -07:00
Claire
4fcc026f0f
Bump version to v4.2.0 ( #27017 )
CodeQL / Analyze (ruby) (push) Has been cancelled
Markdown Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
YML Linting / lint (push) Has been cancelled
Test one step migrations / pre_job (push) Has been cancelled
Test one step migrations / test (14-alpine) (push) Has been cancelled
Test one step migrations / test (15-alpine) (push) Has been cancelled
Test two step migrations / pre_job (push) Has been cancelled
Test two step migrations / test (14-alpine) (push) Has been cancelled
Test two step migrations / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (1, .ruby-version) (push) Has been cancelled
Ruby Testing / test (1, 3.0) (push) Has been cancelled
Ruby Testing / test (1, 3.1) (push) Has been cancelled
Ruby Testing / test (2, .ruby-version) (push) Has been cancelled
Ruby Testing / test (2, 3.0) (push) Has been cancelled
Ruby Testing / test (2, 3.1) (push) Has been cancelled
Ruby Testing / test (3, .ruby-version) (push) Has been cancelled
Ruby Testing / test (3, 3.0) (push) Has been cancelled
Ruby Testing / test (3, 3.1) (push) Has been cancelled
Ruby Testing / test (4, .ruby-version) (push) Has been cancelled
Ruby Testing / test (4, 3.0) (push) Has been cancelled
Ruby Testing / test (4, 3.1) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.0) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / Testing search (.ruby-version) (push) Has been cancelled
Ruby Testing / Testing search (3.0) (push) Has been cancelled
Ruby Testing / Testing search (3.1) (push) Has been cancelled
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
