docker updates

Author: bjuric

docs/13-docker.mdx

@@ -104,6 +104,12 @@ RUN apk update \
     && apk add curl \
     && apk add tzdata \
     && apk add openjdk17-jre
+
+# Run as a non root gwen user
+RUN addgroup -S gwen && adduser -S gwen -G gwen -u 4936
+USER gwen
+RUN mkdir -p ~/Downloads
+RUN mkdir -p ~/.assets
 ```
 
 ### Docker compose file
@@ -123,8 +129,8 @@ services:
   node-docker:
     image: selenium/node-docker:4
     volumes:
-      - $PWD/gwen/output/.assets:/opt/selenium/assets
-      - $PWD/gwen/output/downloads:/home/seluser/Downloads
+      - assets:/opt/selenium/assets
+      - downloads:/home/seluser/Downloads
       - $PWD/gwen/conf/browsers/grid.toml:/opt/selenium/docker.toml
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
@@ -166,7 +172,9 @@ services:
       - NO_COLOR
       - TZ
     volumes:
-      - "$PWD:/project"
+      - $PWD:/project
+      - assets:/home/gwen/.assets
+      - downloads:/home/gwen/Downloads
     working_dir: /project
     command: bash -c "yarn install && yarn gwen -b -c gwen/conf/browsers/grid.conf gwen/features"
 
@@ -183,6 +191,10 @@ services:
       - "$PWD:/project"
     working_dir: /project
     command: bash -c "yarn install && yarn gwen -bn --parallel gwen/features"
+
+volumes:
+  assets: 
+  downloads:
 ```
 
 It will also create a `gwen/docker-compose-arm.toml` file for ARMs, with the only difference being the toml file mapping.
@@ -245,7 +257,7 @@ host-config-keys = ["Dns", "DnsOptions", "DnsSearch", "ExtraHosts", "Binds", "Mo
 url = "http://127.0.0.1:2375"
 
 # Docker image used for video recording
-video-image = "selenium/video:ffmpeg-6.1-20231219"
+video-image = "selenium/video:ffmpeg-7.1-20250101"
 
 # Uncomment the following section if you are running the node on a separate VM
 # Fill out the placeholders with appropriate values
@@ -293,6 +305,10 @@ gwen {
       }
     }
   }
+  video {
+    dir = "$<user.home>/.assets/$<gwen.web.sessionId>"
+    timeoutSecs = 10
+  }
 }
 ```
 

docs/32-jenkins.mdx

@@ -80,10 +80,10 @@ pipeline {
     choice(name: 'process', choices: [''], description: 'Target process')
     choice(name: 'browser', choices: ['chrome', 'firefox', 'edge'], description: 'Target web browser')
     booleanParam(name: 'dry_run', defaultValue: false, description: 'Validate without executing')
-    booleanParam(name: 'parallel', defaultValue: false, description: 'Enable parallel execution') 
+    booleanParam(name: 'parallel', defaultValue: false, description: 'Enable parallel batch execution across cores')
     choice(name: 'threads', choices: ['auto', '2', '4', '8', '12', '16', '24', '32', '48', '64'], description: 'Number of parallel threads (auto = one thread per available core)')
     booleanParam(name: 'headless', defaultValue: false, description: 'Enable headless browser') 
-    booleanParam(name: 'video', defaultValue: true, description: 'Enable video capture (not available with parallel or headless)')
+    booleanParam(name: 'video', defaultValue: false, description: 'Enable video recording') 
   }
   environment {
     GWEN_ENV = "${params.env}"
@@ -99,37 +99,43 @@ pipeline {
     stage("Prepare") {
       steps {
         script {
+          // Clean up docker
+          sh 'docker rm -f $(docker ps -a -q) || true'
+          sh 'docker volume rm gwen_assets gwen_downloads || true'
           // Prepare output dir
-          sh 'mkdir -p gwen/output'
           sh 'rm -rf gwen/output/**'
+          sh 'mkdir -p gwen/output'
         }
       }
     }
     stage("Gwen") {
       steps {
-        try {
-          // Spin up environment and execute Gwen in docker
-          sh "docker-compose -p ${env.BUILD_TAG.toLowerCase()} -f gwen/docker-compose.yml run gwen"
-          if (!fileExists('gwen/output/reports/html/index.html')) {
-            error 'Evaluation report not generated'
-          }
-        } catch(err) {
-          if (fileExists('gwen/output/reports/html/index.html')) {
-            unstable 'Gwen completed with failure(s) reported.'
-          } else {
-            error "Gwen failed to execute or complete: ${err.getMessage()}"
+        script {
+          try {
+            // Spin up environment and execute Gwen in docker
+            sh "docker-compose -f gwen/docker-compose.yml -p ${env.BUILD_TAG.toLowerCase()} run gwen"
+            if (!fileExists('gwen/output/reports/html/index.html')) {
+              error 'Evaluation report not generated'
+            }
+          } catch(err) {
+            if (fileExists('gwen/output/reports/html/index.html')) {
+              unstable 'Gwen completed with failure(s) reported.'
+            } else {
+              error "Gwen failed to execute or complete: ${err.getMessage()}"
+            }
           }
         }
       }
       post {
         always {
-          sh "docker-compose -p ${env.BUILD_TAG.toLowerCase()} -f gwen/docker-compose.yml down || true"
-          archiveArtifacts artifacts: 'gwen/output/reports/**'
+          sh "docker-compose -f gwen/docker-compose.yml -p ${env.BUILD_TAG.toLowerCase()} down || true"
+          sh 'docker rm -f $(docker ps -a -q) || true'
+          sh 'docker volume rm gwen_assets gwen_downloads || true'
           publishHTML(target: [
                         allowMissing          : true,
                         alwaysLinkToLastBuild : false,
                         keepAll               : true,
-                        reportDir             : "gwen/output/reports/html",
+                        reportDir             : 'gwen/output/reports/html',
                         reportFiles           : 'index.html',
                         reportName            : "Gwen-Report"
           ])