Merge pull request #145 from xdev-software/develop

AB-xdev · web-flow · commit 9a9aab393887 · 2025-06-02T13:30:49.000Z
Release
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -33,6 +33,15 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of the problem
+      description: |
+        Describe as exactly as possible what is not working.
+    validations:
+      required: true
+
   - type: textarea
     id: steps-to-reproduce
     attributes:
@@ -47,20 +56,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: |
-        Tell us what you expect to happen.
-
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual behavior
-      description: |
-        Tell us what happens with the steps given above.
-
   - type: textarea
     id: additional-information
     attributes:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.2.2
+* [Browser] Improve SHM configuration
+
 # 1.2.1
 * Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
 * Updated dependencies
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.1</version>
+								<version>10.25.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/testcontainers-selenium-demo/pom.xml b/testcontainers-selenium-demo/pom.xml
@@ -34,7 +34,7 @@
 			<dependency>
 				<groupId>org.seleniumhq.selenium</groupId>
 				<artifactId>selenium-dependencies-bom</artifactId>
-				<version>4.32.0</version>
+				<version>4.33.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.21.0</version>
+			<version>1.21.1</version>
 			<exclusions>
 				<!-- No JUnit 4 -->
 				<exclusion>
@@ -68,7 +68,7 @@
 		<dependency>
 			<groupId>software.xdev</groupId>
 			<artifactId>testcontainers-junit4-mock</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2</version>
 		</dependency>
 
 		<!-- Testcontainers is using outdated v1 -->
@@ -82,15 +82,15 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-api</artifactId>
-			<version>4.32.0</version>
+			<version>4.33.0</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<!-- Tests -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.12.2</version>
+			<version>5.13.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-remote-driver</artifactId>
-			<version>4.32.0</version>
+			<version>4.33.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Tracing is not needed -->
@@ -120,13 +120,13 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-support</artifactId>
-			<version>4.32.0</version>
+			<version>4.33.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-firefox-driver</artifactId>
-			<version>4.32.0</version>
+			<version>4.33.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- No unused, beta-grade, RUST blobs -->
@@ -139,7 +139,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.32.0</version>
+			<version>4.33.0</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- No unused, beta-grade, RUST blobs -->
@@ -326,7 +326,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.1</version>
+								<version>10.25.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -363,12 +363,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.13.0</version>
+								<version>7.14.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java
@@ -89,6 +89,8 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 	
 	protected static final String TC_TEMP_DIR_PREFIX = "tc";
 	
+	protected static Boolean currentOsWindows; // You should use the method instead, this might be NULL
+	
 	protected boolean mapTimezoneIntoContainer = true;
 	
 	protected boolean validateImageEnabled = true;
@@ -280,19 +282,33 @@ protected void configureShm()
 	{
 		if(this.getShmSize() == null)
 		{
-			if(Optional.ofNullable(System.getProperty("os.name"))
-				.map(osName -> osName.startsWith("Windows"))
-				.orElse(false))
+			if(this.shouldDirectMountShm())
 			{
-				this.withSharedMemorySize(512 * FileUtils.ONE_MB);
+				this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));
 			}
 			else
 			{
-				this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));
+				this.withSharedMemorySize(512 * FileUtils.ONE_MB);
 			}
 		}
 	}
 	
+	protected boolean shouldDirectMountShm()
+	{
+		return !isCurrentOsWindows();
+	}
+	
+	protected static boolean isCurrentOsWindows()
+	{
+		if(currentOsWindows == null)
+		{
+			currentOsWindows = Optional.ofNullable(System.getProperty("os.name"))
+				.map(osName -> osName.startsWith("Windows"))
+				.orElse(false);
+		}
+		return !currentOsWindows;
+	}
+	
 	protected void configureVNC()
 	{
 		if(this.disableVNC)

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE`
`89`	`89`
`90`	`90`	`protected static final String TC_TEMP_DIR_PREFIX = "tc";`
`91`	`91`
	`92`	`+ protected static Boolean currentOsWindows; // You should use the method instead, this might be NULL`
	`93`	`+`
`92`	`94`	`protected boolean mapTimezoneIntoContainer = true;`
`93`	`95`
`94`	`96`	`protected boolean validateImageEnabled = true;`
`@@ -280,19 +282,33 @@ protected void configureShm()`
`280`	`282`	`{`
`281`	`283`	`if(this.getShmSize() == null)`
`282`	`284`	`{`
`283`		`- if(Optional.ofNullable(System.getProperty("os.name"))`
`284`		`- .map(osName -> osName.startsWith("Windows"))`
`285`		`- .orElse(false))`
	`285`	`+ if(this.shouldDirectMountShm())`
`286`	`286`	`{`
`287`		`- this.withSharedMemorySize(512 * FileUtils.ONE_MB);`
	`287`	`+ this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));`
`288`	`288`	`}`
`289`	`289`	`else`
`290`	`290`	`{`
`291`		`- this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw));`
	`291`	`+ this.withSharedMemorySize(512 * FileUtils.ONE_MB);`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
	`296`	`+ protected boolean shouldDirectMountShm()`
	`297`	`+ {`
	`298`	`+ return !isCurrentOsWindows();`
	`299`	`+ }`
	`300`	`+`
	`301`	`+ protected static boolean isCurrentOsWindows()`
	`302`	`+ {`
	`303`	`+ if(currentOsWindows == null)`
	`304`	`+ {`
	`305`	`+ currentOsWindows = Optional.ofNullable(System.getProperty("os.name"))`
	`306`	`+ .map(osName -> osName.startsWith("Windows"))`
	`307`	`+ .orElse(false);`
	`308`	`+ }`
	`309`	`+ return !currentOsWindows;`
	`310`	`+ }`
	`311`	`+`
`296`	`312`	`protected void configureVNC()`
`297`	`313`	`{`
`298`	`314`	`if(this.disableVNC)`