35 Commits (be851321c037a921e055b175d64d0b54d313f8b3)

Author	SHA1	Message	Date
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"`	6 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”	6 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).	6 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
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	7 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	7 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.	7 years ago
Yamagishi Kazutoshi	3d881eed27	Add packs volume to docker-compose.yml (#6348)	7 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.	7 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.	8 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 Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time	8 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	8 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;	8 years ago
Eugen	211920b622	Revert "add persistance to Postresql container" (#1251)	8 years ago
Valentin_NC	b73cee9774	add volume for redis container	8 years ago
Valentin_NC	4512fde181	add persistance to Postresql container	8 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.	8 years ago
Wonderfall	b7beb4368c	use alpine-based official images	8 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.	8 years ago
Eugen Rochko	cc70f28f19	Adding rack timeout of 30sec, PuSH jobs moved to push queue so they ... can be processed separately	8 years ago
Eugen Rochko	8efa081f21	Remove Neo4J	8 years ago
Eugen Rochko	19615a2c37	Add restart policy to docker compose	8 years ago
Eugen Rochko	492a682e34	Add custom neo4j dockerfile with graphaware and noderank plugins	8 years ago
Eugen Rochko	4d336cefac	Add sync command for neo4j, fix configuration, add neo4j to docker-compose, fix seed	8 years ago
Eugen Rochko	42dcb0d4cb	Adding Sidekiq for background processing (firstly just of mailers)	9 years ago
Eugen Rochko	48d66a2055	Fixing the docker container setup (with assets compilation &co)	9 years ago
Eugen Rochko	b17202ca0f	Adding a docker-compose template for running Mastodon easily	9 years ago