Merge pull request #350 from montehurd/more-stability-fixes

More stability fixes

.env

@@ -1,3 +1,3 @@
 PIXEL_MW_SCRIPT_PATH=/w
-PIXEL_MW_DOCKER_PORT=3000
-PIXEL_MW_SERVER="http://localhost:${PIXEL_MW_DOCKER_PORT}"
+PIXEL_MW_DOCKER_PORT=8080
+PIXEL_MW_SERVER="http://mediawiki-web:${PIXEL_MW_DOCKER_PORT}"

clean.sh

@@ -5,7 +5,7 @@
 # will reset everything so that Pixel starts with a clean slate.
 
 # Stop and remove Docker containers, networks, and volumes
-docker compose --progress=plain --project-directory . -f ./docker-compose.yml down --rmi all --volumes --remove-orphans
+docker compose --progress=plain --project-directory . -f ./docker-compose.yml down --rmi all --volumes --remove-orphans 2>&1
 
 # Remove other images and intermediate build artifacts
-docker system prune -af
+docker system prune -af 2>&1

config/configCommon.js

@@ -4,17 +4,16 @@ module.exports = {
 	asyncCompareLimit: 25,
 	engine: 'puppeteer',
 	engineOptions: {
-		headless: 'new',
+		headless: true,
 		args: [
 			'--no-sandbox',
 			'--disable-setuid-sandbox',
-			'--single-process',
 			'--disable-dev-shm-usage',
 			'--disable-gpu',
 			'--disable-gpu-sandbox'
 		]
 	},
-	debug: true,
+	debug: false,
 	debugWindow: false,
 	delay: 100
 };

docker-compose.yml

@@ -1,3 +1,6 @@
+networks:
+  pixel_network:
+
 volumes:
   dbdata:
   mwcode:
@@ -25,6 +28,8 @@ services:
     depends_on:
       database:
         condition: service_healthy
+    networks:
+      - pixel_network
   mediawiki-web:
     image: docker-registry.wikimedia.org/dev/buster-apache2:2.0.0-s1
     ports:
@@ -40,6 +45,8 @@ services:
     depends_on:
       database:
         condition: service_healthy
+    networks:
+      - pixel_network
   database:
     build:
       context: .
@@ -54,9 +61,10 @@ services:
       interval: 1s
       timeout: 5s
       retries: 20
+    networks:
+      - pixel_network
   visual-regression:
     init: true
-    network_mode: host
     build:
       context: .
       dockerfile: Dockerfile.visual-regression
@@ -75,9 +83,10 @@ services:
     shm_size: 2gb
     cap_add:
       - SYS_ADMIN
+    networks:
+      - pixel_network
   a11y-regression:
     init: true
-    network_mode: host
     build:
       context: .
       dockerfile: Dockerfile.a11y-regression
@@ -96,6 +105,8 @@ services:
     shm_size: 2gb
     cap_add:
       - SYS_ADMIN
+    networks:
+      - pixel_network
   png-optimizer:
     build:
       context: .
@@ -104,3 +115,5 @@ services:
       - ./report:/pixel/report
       - ./png-optimizer.sh:/opt/scripts/png-optimizer.sh
     working_dir: /pixel/report
+    networks:
+      - pixel_network

rebuild.sh

@@ -3,13 +3,13 @@
 set -e
 
 # Stop and remove Docker containers, networks, and volumes
-./clean.sh
+./clean.sh 2>&1
 
 # Build the pixel-base-regression image
-./build-base-regression-image.sh
+./build-base-regression-image.sh 2>&1
 
 # Build or rebuild services
-docker compose --progress=plain --project-directory . -f ./docker-compose.yml build
+docker compose --progress=plain --project-directory . -f ./docker-compose.yml build 2>&1
 
 # Remove any dangling images
-docker image prune -f
+docker image prune -f 2>&1