Commit graph

92 commits

Author SHA1 Message Date
Mouse Reeve
439b0bcd27 Merge branch 'main' into production 2024-01-02 08:32:10 -08: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
Mouse Reeve
1093e95de7 Merge branch 'main' into production 2023-10-02 10:23:13 -07:00
JJimenez71
2260e14868 Pinned versions of docker containers 2023-09-07 19:30:29 -06:00
Hugh Rundle
f7c304f192
increase prod to 8 threads 2023-08-20 10:26:44 +10:00
Hugh Rundle
5ea4a8763c
temporarily fix signed get requests failing
Various issues have been raised regarding requests that seem to be dropped.
The real fix for this in #2717 - "Stop making HTTP requests in views"

This commit is a quick fix in some circumstances - particularly #2844 - signed GET requests failing in production.
It adds an extra thread to Gunicorn to make the default configuration multi-threaded.
This will now match the multi-threaded nature of the development environment, which is why we have not been able to replicate these errors in dev.
2023-08-19 10:20:22 +10:00
Mouse Reeve
21f65cac58 Merge branch 'main' into production 2023-07-20 19:09:38 -07:00
Wesley Aptekar-Cassels
3e78e398c0 Switch from priority queues to function-based queues
Fixes: #2907
2023-07-20 12:25:30 -04:00
Wesley Aptekar-Cassels
fe020b7c95 Add default retention policy to containers
Docker makes it extremely difficult to do time-based retention,
unfortunately, so space-based is the best we'll be able to do. This is
probably fairly aggressive for bookwyrm.social, and not nearly
aggressive enough for smaller instances, but it's better than the
current status quo.

I've only tested that this builds and runs, not that it actually has the
intended effect.
2023-04-03 21:30:28 -04:00
Mouse Reeve
dd505a8814 Merge branch 'main' into production 2023-02-22 09:00:13 -08: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
2c5811fb6f Merge branch 'main' into production 2022-12-16 15:27:13 -08:00
Mouse Reeve
427d0c4fc8 Create a separate celery queue for imports 2022-12-16 14:20:50 -08:00
Mouse Reeve
58335539fc Merge branch 'main' into production 2022-12-11 13:59:27 -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
Mouse Reeve
ed28e2d6e8 Merge branch 'main' into production 2022-11-23 22:11:59 -08: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
e452aa95b6 Merge branch 'main' into production 2022-07-04 14:08:24 -07: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
Mouse Reeve
b1f3253aa7 Merge branch 'main' into production 2022-05-16 10:00:19 -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
Mouse Reeve
67bb154008 Merge branch 'main' into production 2022-03-17 08:56:15 -07: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
abfd094337 Merge branch 'main' into production 2022-02-18 18:17:43 -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
0a6c14dc8a Merge branch 'main' into production 2022-02-04 18:13:00 -08:00
Mouse Reeve
ea035b9fbe Don't expose unnecessary ports 2022-02-04 17:58:29 -08:00
Mouse Reeve
637600763b Merge branch 'main' into production 2022-01-07 10:25:39 -08:00
Mouse Reeve
c89b8ee5db Updates flower 2022-01-07 09:45:21 -08:00
Mouse Reeve
d650585858 Merge branch 'main' into production 2022-01-06 12:23:07 -08:00
Mouse Reeve
bebb2c167e Use redis with password in dev 2022-01-05 08:52:28 -08:00
Mouse Reeve
7744b9a117 Merge branch 'main' into production 2021-09-22 12:34:22 -07:00
Mouse Reeve
41d34c6d4b Correctly use custom postgres ports 2021-09-22 08:13:31 -07:00
Mouse Reeve
8f50f8758c Merge branch 'main' into production 2021-09-08 09:09:09 -07:00
Mouse Reeve
c0b662cbd7 Adds priority queues to celery 2021-09-07 16:06:54 -07:00
Mouse Reeve
c3f938d500 Merge branch 'main' into production 2021-06-05 12:53:03 -07:00
Mouse Reeve
8086b9bca5 Reverts to functional certbot configuration 2021-06-05 10:46:41 -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
bcj
238862a4cf Have redis_* grab port information from .env 2021-05-18 00:54:15 -05:00
bcj
bad39aef55 Remove the redis_activity ports listing
It is misleading, it isn't binding to that port
2021-05-17 00:07:59 -05:00