Exposed Selenium VNC to host.

drevops · Aug 30, 2024 · 69a52f8 · 69a52f8 · github-actions · Aug 30, 2024
1 parent 7b0636a
commit 69a52f8
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 0 deletions.
diff --git a/.ahoy.yml b/.ahoy.yml
@@ -37,6 +37,7 @@ commands:
       COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-${PWD##*/}} \
       DREVOPS_HOST_DB_PORT=$(docker compose port mariadb 3306 2>/dev/null | cut -d : -f 2) \
       DREVOPS_HOST_SOLR_PORT=$(docker compose port solr 8983 2>/dev/null | cut -d : -f 2) \
+      DREVOPS_HOST_SELENIUM_VNC_PORT=$(docker compose port chrome 7900 2>/dev/null | cut -d : -f 2) \
       DREVOPS_HOST_HAS_SEQUELACE=$(uname -a | grep -i -q darwin && mdfind -name 'Sequel Ace' 2>/dev/null | grep -q "Ace" && echo 1 || true) \
       ahoy cli ./scripts/drevops/info.sh "$@"
 

diff --git a/.scaffold/tests/bats/_helper.workflow.bash b/.scaffold/tests/bats/_helper.workflow.bash
@@ -303,6 +303,7 @@ assert_ahoy_info() {
     assert_output_not_contains "DB-in-image             : ${db_image}"
   fi
   assert_output_contains "Solr URL on host            :"
+  assert_output_contains "Selenium VNC URL on host    :"
   assert_output_contains "Mailhog URL                 : http://mailhog.docker.amazee.io/"
   assert_output_contains "Xdebug                      : Disabled ('ahoy debug' to enable)"
   assert_output_not_contains "Containers are not running."

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env.json b/.scaffold/tests/bats/fixtures/docker-compose.env.json
@@ -47,6 +47,13 @@
             "networks": {
                 "default": null
             },
+            "ports": [
+                {
+                    "mode": "ingress",
+                    "protocol": "tcp",
+                    "target": 7900
+                }
+            ],
             "shm_size": "1073741824",
             "volumes": [
                 {

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json
@@ -47,6 +47,13 @@
             "networks": {
                 "default": null
             },
+            "ports": [
+                {
+                    "mode": "ingress",
+                    "protocol": "tcp",
+                    "target": 7900
+                }
+            ],
             "shm_size": "1073741824",
             "volumes": [
                 {

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json
@@ -47,6 +47,13 @@
             "networks": {
                 "default": null
             },
+            "ports": [
+                {
+                    "mode": "ingress",
+                    "protocol": "tcp",
+                    "target": 7900
+                }
+            ],
             "shm_size": "1073741824",
             "volumes": [
                 {

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.noenv.json b/.scaffold/tests/bats/fixtures/docker-compose.noenv.json
@@ -47,6 +47,13 @@
             "networks": {
                 "default": null
             },
+            "ports": [
+                {
+                    "mode": "ingress",
+                    "protocol": "tcp",
+                    "target": 7900
+                }
+            ],
             "shm_size": "1073741824",
             "volumes": [
                 {

diff --git a/scripts/drevops/info.sh b/scripts/drevops/info.sh
@@ -44,6 +44,9 @@ fi
 if [ -n "${DREVOPS_HOST_SOLR_PORT:-}" ]; then
   note "Solr URL on host            : http://127.0.0.1:${DREVOPS_HOST_SOLR_PORT}"
 fi
+if [ -n "${DREVOPS_HOST_SELENIUM_VNC_PORT:-}" ]; then
+  note "Selenium VNC URL on host    : http://localhost:${DREVOPS_HOST_SELENIUM_VNC_PORT}/?autoconnect=1&password=secret"
+fi
 note "Mailhog URL                 : http://mailhog.docker.amazee.io/"
 note "Xdebug                      : $(php -v | grep -q Xdebug && echo "Enabled ('ahoy up cli' to disable)" || echo "Disabled ('ahoy debug' to enable)")"
 if [ "${DREVOPS_SHOW_LOGIN}" = "1" ] || [ -n "${1:-}" ]; then