Commit Graph

56 Commits (master)

Author SHA1 Message Date
Tykayn e6d4236925 add email link in admin list 7 months ago
Shlee 159b4edeef
Update docker-compose.yml (#19063) 9 months 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
12 months ago
Markus Petzsch e3cebfa457
chore: bump elasticsearch version in docker-compose.yml file; closes #18189 (#18637) 12 months ago
Tykayn 8f91509323 up from glitch 1 year ago
Yamagishi Kazutoshi 584d8b977b
Format JSON and YAML using Prettier (#17823)
* Format JSON and YAML using Prettier

* Add prettier to devDep
1 year ago
Tykayn df6b81d678 Merge remote-tracking branch 'glitch-soc/main' 1 year ago
Tykayn 4494d73cbc Merge tag 'v3.4.6' 1 year ago
Claire bb7b2868a0 Bump version to 3.4.6 1 year ago
Claire 1c8c318281 Bump version to 3.4.5 1 year ago
Su Yang 10188c7db7
Add healthcheck for sidekiq (#17365) 1 year 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
2 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
2 years ago
Shlee a2ce7508c9
Update docker-compose.yml (#16489) 2 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
3 years ago
Shlee 328c5a21d7
Update docker-compose.yml (#13756) 3 years ago
Matej Ľach 490ff09c5a
increase the postgres container shm_size from 64mb to 256mb (#13451) 3 years ago
Yamagishi Kazutoshi d7268befa8 Add healthcheck endpoint for web (#11770) 4 years ago
Eugen Rochko 15c7478c55
Change Dockerfile to bind to instead of docker-compose.yml (#11351) 4 years ago
Eugen Rochko e7353c47db
Change default interface of web and streaming from to (#11302) 4 years ago
Shlee ab829d4aa8 Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 4 years ago
Fabian Schlenz 50b36ef59d Fixed Healthchecks in docker-compose.yml (#10553) 4 years ago
Sir-Boops 90398b9d00 Remove uneeded command and switch to images for TOR (#9438) 4 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     postgres    Up (healthy)
mastodon_es_1              /usr/local/bin/docker-entr ...   Up (healthy)
mastodon_redis_1  redis ...   Up (healthy)
mastodon_redis_cache_1 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,>4000/tcp
mastodon_web_1             /sbin/tini -- bash -c rm - ...   Up (healthy)>3000/tcp, 4000/tcp
4 years ago
Eugen Rochko 969a10a5d1
Persist volumes by default in docker-compose (#9055)
Too many databases were lost to this
5 years ago
luzpaz 40dd19be37 Misc. typos (#8694)
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
5 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”
5 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).
5 years ago
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`.
5 years ago
J Yeary 905bd24788 TOR federation (#7875) 5 years ago
Isatis c7ac039697 Remove Puma pidfile before boot if container receives SIGTERM (#7052) 5 years ago
Valentin Lorentz 1e87ed44d5 docker-compose: Only bind ports 3000 and 4000 on localhost. (#7138) 5 years ago
Eugen Rochko d7573fe584
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
5 years ago
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
5 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
* Add full-text search for authorized statuses

- Search API will return statuses that match the query
- Only for logged in users
- Only if you are author of the status,
- Or you were mentioned in it
- Or you favourited or reblogged it
- Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
- Run `rails chewy:deploy` to create & populate index

Fix #5880
Fix #4293
Fix #1152

* Add commented out docker-compose configuration for ES container

* Optimize index import, filter search results

* Add basic normalization to the index

* Add better stemming and normalization to the index

* Skip webfinger request if search query includes both @ and a space

* Fix code style

* Visually separate search result sections

* Fix code style issues
5 years ago
Akihiko Odaki 9da81a1639 Isolate internal services from external networks in Docker configuration (#6369)
The database and Redis do not need external connections, so isolate them
and prevent unauthorized access.
5 years ago
Yamagishi Kazutoshi 3d881eed27 Add packs volume to docker-compose.yml (#6348) 5 years ago
unarist c75ca0525b Specify middleware versions in docker-compose.yml (#5247)
PostgreSQL10 has been released, but upgrading from older versions needs dump/restore. If you pull new version without those handling, db service will fail to launch.

To prevent accidentally upgrading, and as a recommended version, this patch specifies PostgreSQL and Redis version.
6 years ago
Valentin Ouvrard 75bd141e22 Switch docker-compose to version 3. (#2747)
* Switch docker-compose to version 3.

It allow possibility to Deploy Mastodon in a Swarm cluster directly from the compose file.

* switch to compose v3 without depend.
6 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add for running rails, webpack and streaming API at the same time
6 years ago
Pierre Ozoux 0d2910478a Use image too in docker-compose (#1109)
* Use image too in docker-compose

It is possible with version 2 of compose to use both `build` and `image`

* Update docker-compose.yml
6 years ago
Valentin Ouvrard b723ee73fc Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253)
* enable commented volume in docker-compose.yml

* Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability

* add my instance to the list

* enable GZIP on nginx.conf

* readd root /home/mastodon/live/public;
6 years ago
Eugen 211920b622 Revert "add persistance to Postresql container" (#1251) 6 years ago
Valentin_NC b73cee9774 add volume for redis container 6 years ago
Valentin_NC 4512fde181 add persistance to Postresql container 6 years ago
Eugen Rochko f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull"
must be added to the Sidekiq invokation in your systemd file

The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
6 years ago
Wonderfall b7beb4368c
use alpine-based official images 6 years ago
Eugen Rochko ccb8ac8573 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
6 years ago
Eugen Rochko cc70f28f19 Adding rack timeout of 30sec, PuSH jobs moved to push queue so they
can be processed separately
7 years ago
Eugen Rochko 8efa081f21 Remove Neo4J 7 years ago