automated commit

Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
chainguard-images · Nov 4, 2024 · 9bf14db · 9bf14db
1 parent f431c24
commit 9bf14db
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 17 deletions.
diff --git a/generated.tf b/generated.tf
diff --git a/images/docker-selenium/README.md → images/selenium/README.md b/images/docker-selenium/README.md → images/selenium/README.md
@@ -59,7 +59,7 @@ Access noVNC:
 http://localhost:7900/vnc.html`:
 ```
 
-* Login with the password `secret`.
+- Login with the password `secret`.
 
 Any WebDriver tests should point to Selenium on on port 4444.
 

diff --git a/images/docker-selenium/TESTING.md → images/selenium/TESTING.md b/images/docker-selenium/TESTING.md → images/selenium/TESTING.md
diff --git a/images/docker-selenium/config/main.tf → images/selenium/config/main.tf b/images/docker-selenium/config/main.tf → images/selenium/config/main.tf
@@ -27,7 +27,7 @@ output "config" {
     contents = {
       packages = concat([
         "docker-selenium-supervisor-config",
-        "docker-selenium-standalone-chrome",
+        "docker-selenium-standalone-chromium",
       ], var.extra_packages)
     }
     accounts = module.accts.block

diff --git a/images/docker-selenium/generated.tf → images/selenium/generated.tf b/images/docker-selenium/generated.tf → images/selenium/generated.tf
diff --git a/images/docker-selenium/main.tf → images/selenium/main.tf b/images/docker-selenium/main.tf → images/selenium/main.tf
@@ -10,13 +10,18 @@ variable "target_repository" {
 
 module "config" {
   source         = "./config"
-  extra_packages = ["docker-selenium"]
+  extra_packages = ["docker-selenium-base"]
+}
+
+locals {
+  mangled_repository = replace(var.target_repository, "/selenium", "/docker-selenium")
+
 }
 
 module "latest" {
   source            = "../../tflib/publisher"
   name              = basename(path.module)
-  target_repository = var.target_repository
+  target_repository = local.mangled_repository
   config            = module.config.config
   build-dev         = true
 
@@ -30,7 +35,6 @@ module "latest" {
 
 module "test" {
   source = "./tests"
-
   digest = module.latest.image_ref
 }
 

diff --git a/images/docker-selenium/metadata.yaml → images/selenium/metadata.yaml b/images/docker-selenium/metadata.yaml → images/selenium/metadata.yaml
diff --git a/images/docker-selenium/tests/main.tf → images/selenium/tests/main.tf b/images/docker-selenium/tests/main.tf → images/selenium/tests/main.tf
@@ -35,7 +35,7 @@ resource "imagetest_feature" "test" {
     name    = "basic test"
     workdir = "/tests"
     cmd     = <<EOF
-        ./smoke.sh
+        /tests/smoke.sh
       EOF
     },
   ]

diff --git a/images/docker-selenium/tests/smoke.sh → images/selenium/tests/smoke.sh b/images/docker-selenium/tests/smoke.sh → images/selenium/tests/smoke.sh
@@ -8,7 +8,7 @@ CONTAINER_NAME="docker-selenium-$(uuidgen)"
 
 SELENIUM_PORT="4444"
 NO_VNC_PORT="7900"
-VNC_PORT="5900"
+VNC_PORT="5900" 
 
 # Start container
 docker run \
@@ -17,6 +17,16 @@ docker run \
   -p "${NO_VNC_PORT}":7900 \
   -p "${VNC_PORT}":5900 \
   -e "SE_NO_VNC_PORT=${NO_VNC_PORT}" \
+  -e SE_ENABLE_TRACING="false" \
+  -e SE_NODE_HOST="localhost" \
+  -e CONFIG_FILE="/opt/selenium/config.toml" \
+  -e SE_SESSION_RETRY_INTERVAL="15" \
+  -e SE_SESSION_REQUEST_TIMEOUT="300" \
+  -e SE_RELAX_CHECKS="true" \
+  -e SE_HEALTHCHECK_INTERVAL="120" \
+  -e SE_HUB_HOST="localhost" \
+  -e "SE_BIND_HOST=true" \
+  -e "SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=false" \
   -e "SE_VNC_PORT=${VNC_PORT}" \
   --platform linux/x86_64 \
   --name "${CONTAINER_NAME}" \
@@ -90,4 +100,4 @@ for assert in "${false_asserts[@]}"; do
   fi
 done
 
-echo "All checks passed successfully."
+echo "All checks passed successfully."