Update environment (#917)

* Update node version from 17 to 22 in Dockerfile

* Decrease number of screenshot workers to 3

- we previously had a parallel test limit of 5, now testingbot gave us 4,
which means we will keep our amount of screenshot runners below that to reduce conflicts in our queue.

https://phabricator.wikimedia.org/T408226

Author: moiikana

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:17-alpine
+FROM node:22-alpine
 
 WORKDIR /app
 COPY ./package.json /app/package.json

Makefile

@@ -17,6 +17,7 @@ stop-workers:
 	docker compose -f docker-compose.yml -f ${DOCKER_COMPOSE_OVERRIDE} down
 
 # stop container environment and remove all volumes and images. This is used by our ansible deployment script
+# This can also be used for emptying the rabbitmq queue in production.
 shutdown-workers:
 	docker compose -f docker-compose.yml -f ${DOCKER_COMPOSE_OVERRIDE} down -v --remove-orphans --rmi local
 
@@ -28,7 +29,7 @@ build-workers:
 generate-dev-config:
 	if [ ! -f docker-compose.dev.yml ]; then cp docker-compose.dev.example.yml docker-compose.dev.yml; fi
 
-# Start a rabbitmq instance that workers outside the environemnt can connect to
+# Start a rabbitmq instance that workers outside the environment can connect to
 start-rabbitmq:
 	docker run -d --rm --name banner-screenshots-rabbitmq -p 5672:5672 rabbitmq
 

docker-compose.dev.example.yml

@@ -11,7 +11,7 @@ services:
       QUEUE_URL: amqp://rabbitmq
 
   # Run multiple instances of screenshot worker to parallelize screenshot jobs.
-  # Should be less than 5 to be sure not to run into limits
+  # Should be less than 4 to be sure not to run into limits
   screenshot_worker_1:
     build: .
     entrypoint: [ "npx", "ts-node", "screenshot_worker.ts", "--verbose" ]
@@ -51,20 +51,6 @@ services:
       TB_KEY: ${TB_KEY}
       TB_SECRET: ${TB_SECRET}
 
-  screenshot_worker_4:
-    build: .
-    entrypoint: [ "npx", "ts-node", "screenshot_worker.ts", "--verbose" ]
-    volumes:
-      - ./banner-shots:/app/banner-shots
-      - ./campaign_info.example.toml:/app/campaign_info.toml
-    depends_on:
-      - rabbitmq
-    environment:
-      QUEUE_URL: amqp://rabbitmq
-      TB_KEY: ${TB_KEY}
-      TB_SECRET: ${TB_SECRET}
-
-
   rabbitmq:
     ports:
       - "5672:5672"

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       QUEUE_URL: amqp://rabbitmq
 
   # Run multiple instances of screenshot worker to parallelize screenshot jobs.
-  # Should be less than 5 to be sure not to run into limits
+  # Should be less than 4 to be sure not to run into limits
   screenshot_worker_1:
     build: .
     entrypoint: [ "npx", "ts-node", "screenshot_worker.ts", "--verbose" ]
@@ -39,16 +39,5 @@ services:
       TB_KEY: ${TB_KEY}
       TB_SECRET: ${TB_SECRET}
 
-  screenshot_worker_4:
-    build: .
-    entrypoint: [ "npx", "ts-node", "screenshot_worker.ts", "--verbose" ]
-    depends_on:
-      - rabbitmq
-    environment:
-      QUEUE_URL: amqp://rabbitmq
-      TB_KEY: ${TB_KEY}
-      TB_SECRET: ${TB_SECRET}
-
-
   rabbitmq:
     image: "rabbitmq"