Commit graph

53 commits

Author SHA1 Message Date
Hugh Rundle
c0ce22a607
docker-compose 'version' has been deprecated 2024-09-09 10:04:16 +10:00
Bart Schuurmans
073f62d5bb Add exports_volume to docker-compose.yml
Exports should be written to a Docker volume instead of to the bind mount (= source directory). This
way they are shared between different containers even when they run on different machines.
2024-03-24 12:08:29 +01:00
Bart Schuurmans
7c2fa746ae Revert "docker-compose.yml: make all bind mounts read only"
This reverts commit 864304f128.
2024-03-24 11:23:23 +01:00
Mouse Reeve
886d6ec9f7
Merge branch 'main' into docker-bind-ro 2024-03-23 07:48:27 -07:00
Bart Schuurmans
68cb94daf2 docker-compose.yml: don't automatically start dev-tools by assigning profile 2024-03-18 21:34:51 +01:00
Bart Schuurmans
864304f128 docker-compose.yml: make all bind mounts read only
Except dev-tools, since it needs to be able to change the source.
2024-03-18 21:34:09 +01:00
Bart Schuurmans
748418590f docker-compose.yml: mount static_volume for flower
Because flower also uses BookwyrmConfig, it wants to download fonts, and will download them to an
incorrect location if the static_volume is not mounted.
2024-03-18 20:22:19 +01:00
Adeodato Simó
6392a8e01d
Merge pull request #2032 from viviicat/bw-dev-npm-fix
Conflicts:
	bw-dev
	dev-tools/Dockerfile
	bookwyrm/static/css/bookwyrm/_all.scss
	bookwyrm/static/css/themes/bookwyrm-dark.scss
	bookwyrm/static/css/themes/bookwyrm-light.scss
2023-10-18 18:54:53 -03:00
JJimenez71
2260e14868 Pinned versions of docker containers 2023-09-07 19:30:29 -06:00
Wesley Aptekar-Cassels
3e78e398c0 Switch from priority queues to function-based queues
Fixes: #2907
2023-07-20 12:25:30 -04:00
Mouse Reeve
b167364c5c Use a separate queue for broadcasts
I think this will go a long way to solve the federation delay problems
we're seeing on b.s. I'm not sure at what point adding more queues will
create more problems than it solves, but I do think in this case the
queues are out of balance and moving broadcasts (which are the most
common type of `medium_priority` task at the moment) to their own queue
will be an improvement.
2023-02-20 12:58:41 -08:00
Arie van Deursen
5d63b48328
Fix postgres to version 13 in Docker compose
Helps to make tests reproducible, and avoids accidentally
relying on postgres:11 in which some tests fail.
2022-12-26 14:27:46 +01:00
Mouse Reeve
427d0c4fc8 Create a separate celery queue for imports 2022-12-16 14:20:50 -08:00
Trammell Hudson
43b194d612 nginx: route /flower to the queue monitoring system.
This patch removes the exposed port for the flower
server and instead uses nginx to route urls /flower/*
to the queue monitoring system.
2022-12-06 13:01:40 +00:00
Jascha Urbach
cb187c880e
Quote ports in docker-compose
Per sepcification in compose-file v3 ports are in quotes.

https://docs.docker.com/compose/compose-file/compose-file-v3/
2022-11-16 12:38:49 +01:00
Mouse Reeve
e1f6110dc8
Merge branch 'main' into bw-dev-npm-fix 2022-11-14 09:11:16 -08:00
Mouse Reeve
94a6675dc4 Pylint fixes 2022-07-02 12:07:22 -07:00
Mouse Reeve
51f445bc72
Merge branch 'main' into bw-dev-npm-fix 2022-06-11 20:39:18 -07:00
Falko Zurell
d0b7474744
add automatic restart of containers
Added ```restart: unless-stopped``` to keep containers up and running after a reboot.
2022-05-09 11:00:28 +02:00
Vivianne Langdon
dbd5a02617 specify npm prefix and stylelint configs and adjust ignores 2022-03-17 00:50:04 -07:00
Mouse Reeve
95e9119817 Adds django celery beat 2022-02-26 08:44:19 -08:00
Mouse Reeve
1412fa507c Gets prettier command working 2022-02-16 12:54:03 -08:00
Mouse Reeve
714bb081ea Updates workflows 2022-02-15 12:25:35 -08:00
Mouse Reeve
b601ac6f91 Adds dev tools docker image 2022-02-12 14:06:18 -08:00
Mouse Reeve
74fd13fb22 Consistent ordering of items in docker-compose file 2022-02-06 06:37:03 -08:00
Mouse Reeve
7811a9920e Copy config from prod branch to main 2022-02-04 18:36:12 -08:00
Mouse Reeve
ea035b9fbe Don't expose unnecessary ports 2022-02-04 17:58:29 -08:00
Mouse Reeve
c89b8ee5db Updates flower 2022-01-07 09:45:21 -08:00
Mouse Reeve
bebb2c167e Use redis with password in dev 2022-01-05 08:52:28 -08:00
Mouse Reeve
41d34c6d4b Correctly use custom postgres ports 2021-09-22 08:13:31 -07:00
Mouse Reeve
c0b662cbd7 Adds priority queues to celery 2021-09-07 16:06:54 -07:00
bcj
31deb36c85 URL-Encode password in broker_url
Needed to prevent connection errors if the password contains non-urlsafe characters.

Dockerfile change because all the services using it are mirroring ./ in /app now anyway.
Flower needs because it needs bookwyrm in order to read the celerywyrm config (because flower only allows overwriting broker_url from the command line and we want to do it in Python so we have access to a urlencode function).
2021-05-23 23:49:12 -05:00
bcj
76ba116d2f Remove the redis_activity ports listing
It is misleading, it isn't binding to that port
2021-05-18 23:11:02 -05:00
bcj
24152c0129 Read flower port from .env 2021-05-18 18:38:09 -05:00
Mouse Reeve
cda5be65f8 Persistence for redis images 2021-04-15 14:55:08 -07:00
Pablo Barton
d38efa9a9d Easier to deploy by avoiding merge conflicts in production 2021-04-11 13:12:50 -04:00
Mouse Reeve
ebc01362e6 Adds redis image for activity streams 2021-03-22 12:50:55 -07:00
Fabien Basmaison
4de30effa5 [lint] Fix indentation in .yaml files. 2021-03-04 19:44:12 +01:00
Jim Fingal
0b8a9cf1a6 Add support for pytest 2020-11-08 12:14:57 -08:00
Jim Fingal
ca1aa1f70f Run docker flower in the main container for consistency 2020-11-07 18:25:17 -08:00
Mouse Reeve
c4ed174746 Adds flower for celery monitoring 2020-10-31 11:18:40 -07:00
Mouse Reeve
cae7bbf834 oh apparently I DID need to explicitly name .env 2020-10-16 13:20:12 -07:00
Mouse Reeve
b8040cd0dc Move prod config files to prod branch 2020-10-16 13:02:58 -07:00
Mouse Reeve
e24eca7da0 Config files for prod deployment 2020-10-05 14:22:37 -07:00
Mouse Reeve
ab21d2051a Fixes celery image storage
Fixes #207
2020-10-01 10:20:40 -07:00
Mouse Reeve
d1f1260640 Renames fr_celery dir to celerywyrm 2020-09-17 14:19:27 -07:00
Logan Buckley
71bd7412e6 Tweaks needed to get running with docker-compose locally 2020-06-17 12:53:44 -04:00
Mouse Reeve
dbabeab470 Nginx config
Fixes #152 (hopefully???)
Fixes #130
Fixes #125
2020-05-17 20:28:46 -07:00
Mouse Reeve
b0790f3356 Set flower broker
it still doesn't load but we're getting closer
2020-03-31 16:50:58 -07:00
Mouse Reeve
bb04a40044 Move to redis and fix a bunch of things 2020-03-31 16:31:33 -07:00