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

docker-compose.yml

@@ -2,10 +2,10 @@ version: '3'
 
 services:
   nginx:
-    image: nginx:latest
+    image: nginx:1.25.2
     restart: unless-stopped
     ports:
-      - 1333:80
+      - "1333:80"
     depends_on:
       - web
     networks:
@@ -15,7 +15,7 @@ services:
       - static_volume:/app/static
       - media_volume:/app/images
   db:
-    image: postgres
+    image: postgres:13
     env_file: .env
     volumes:
       - pgdata:/var/lib/postgresql/data
@@ -36,9 +36,9 @@ services:
     networks:
       - main
     ports:
-      - 8000
+      - "8000"
   redis_activity:
-    image: redis
+    image: redis:7.2.1
     command: redis-server --requirepass ${REDIS_ACTIVITY_PASSWORD} --appendonly yes --port ${REDIS_ACTIVITY_PORT}
     volumes:
       - ./redis.conf:/etc/redis/redis.conf
@@ -48,7 +48,7 @@ services:
       - main
     restart: on-failure
   redis_broker:
-    image: redis
+    image: redis:7.2.1
     command: redis-server --requirepass ${REDIS_BROKER_PASSWORD} --appendonly yes --port ${REDIS_BROKER_PORT}
     volumes:
       - ./redis.conf:/etc/redis/redis.conf
@@ -62,7 +62,8 @@ services:
     build: .
     networks:
       - main
-    command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority
+    command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc
+
     volumes:
       - .:/app
       - static_volume:/app/static
@@ -86,10 +87,8 @@ services:
     restart: on-failure
   flower:
     build: .
-    command: celery -A celerywyrm flower --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD}
+    command: celery -A celerywyrm flower --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD} --url_prefix=flower
     env_file: .env
-    ports:
-      - ${FLOWER_PORT}:${FLOWER_PORT}
     volumes:
       - .:/app
     networks: