[#1336] Moved to selenium/standalone-chrome for ARM.

drevops · Aug 7, 2024 · fb41904 · fb41904 · github-actions · Aug 7, 2024
1 parent d21e512
commit fb41904
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 41 deletions.
diff --git a/.scaffold/docs/content/getting-started/architecture.mdx b/.scaffold/docs/content/getting-started/architecture.mdx
@@ -84,7 +84,6 @@ with addition of several configuration files and directories.
 ├── behat.yml                # Behat configuration file.
 ├── composer.json            # Composer configuration file.
 ├── docker-compose.yml       # Docker Compose configuration file.
-├── docker-compose.override.default.yml # Docker Compose local configuration file.
 ├── phpcs.xml                # PHP CodeSniffer configuration file.
 ├── phpmd.xml                # PHP Mess Detector configuration file.
 ├── phpstan.neon             # PHPStan configuration file.

diff --git a/.scaffold/tests/bats/_helper.bash b/.scaffold/tests/bats/_helper.bash
@@ -397,7 +397,6 @@ assert_files_present_drevops() {
   assert_file_exists "behat.yml"
   assert_file_exists "composer.json"
   assert_file_exists ".ahoy.local.example.yml"
-  assert_file_exists "docker-compose.override.default.yml"
   assert_file_exists ".env.local.default"
   assert_file_exists "docker-compose.yml"
   assert_file_exists "phpcs.xml"

diff --git a/.scaffold/tests/bats/_helper.workflow.bash b/.scaffold/tests/bats/_helper.workflow.bash
@@ -36,13 +36,6 @@ prepare_sut() {
   mkdir -p .idea
   touch .idea/idea_file.txt
   assert_file_exists .idea/idea_file.txt
-
-  # LCOV_EXCL_START
-  if uname -a | grep -q ARM64; then
-    substep "Override local Docker Compose for ARM."
-    cp docker-compose.override.default.yml docker-compose.override.yml
-  fi
-  # LCOV_EXCL_STOP
 }
 
 docker_remove_image() {

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env.json b/.scaffold/tests/bats/fixtures/docker-compose.env.json
@@ -42,7 +42,7 @@
                 "TZ": "Australia/Melbourne",
                 "XDEBUG_ENABLE": ""
             },
-            "image": "selenium/standalone-chrome:VERSION",
+            "image": "selenium/standalone-chromium:VERSION",
             "labels": {
                 "lagoon.type": "none"
             },

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json
@@ -42,7 +42,7 @@
                 "TZ": "Australia/Melbourne",
                 "XDEBUG_ENABLE": ""
             },
-            "image": "selenium/standalone-chrome:VERSION",
+            "image": "selenium/standalone-chromium:VERSION",
             "labels": {
                 "lagoon.type": "none"
             },

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json
@@ -42,7 +42,7 @@
                 "TZ": "Australia/Melbourne",
                 "XDEBUG_ENABLE": "1"
             },
-            "image": "selenium/standalone-chrome:VERSION",
+            "image": "selenium/standalone-chromium:VERSION",
             "labels": {
                 "lagoon.type": "none"
             },

diff --git a/.scaffold/tests/bats/fixtures/docker-compose.noenv.json b/.scaffold/tests/bats/fixtures/docker-compose.noenv.json
@@ -42,7 +42,7 @@
                 "TZ": "Australia/Melbourne",
                 "XDEBUG_ENABLE": ""
             },
-            "image": "selenium/standalone-chrome:VERSION",
+            "image": "selenium/standalone-chromium:VERSION",
             "labels": {
                 "lagoon.type": "none"
             },

diff --git a/README.dist.md b/README.dist.md
@@ -58,10 +58,6 @@ to DrevOps progress. Remove this section once onboarding is finished.
 - `pygmy up`
 - `ahoy build`
 
-### Apple M1 adjustments
-
-Copy `docker-compose.override.default.yml` to `docker-compose.override.yml`.
-
 ## Project documentation
 
 - [FAQs](docs/faqs.md)

diff --git a/docker-compose.override.default.yml b/docker-compose.override.default.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -221,7 +221,7 @@ services:
 
   # Chrome container, used for browser testing.
   chrome:
-    image: selenium/standalone-chrome:111.0
+    image: selenium/standalone-chromium:126.0
     shm_size: '1gb' # Increase '/dev/shm' partition size to avoid browser crashing.
     <<: *default-volumes # Use default volumes to provide access to test fixtures.
     environment:

diff --git a/renovate.json b/renovate.json
@@ -43,24 +43,11 @@
                 "drupal/core-recommended"
             ]
         },
-        {
-            "groupName": "Container images excluded",
-            "matchManagers": ["dockerfile", "docker-compose"],
-            "matchDepNames": [
-                "selenium/standalone-chrome",
-                "seleniarm/standalone-chromium"
-            ],
-            "enabled": false
-        },
         {
             "groupName": "Container images",
             "groupSlug": "docker",
             "schedule": ["before 3am"],
-            "matchManagers": ["dockerfile", "docker-compose", "custom.regex"],
-            "excludePackageNames": [
-                "selenium/standalone-chrome",
-                "seleniarm/standalone-chromium"
-            ]
+            "matchManagers": ["dockerfile", "docker-compose", "custom.regex"]
         },
         {
             "groupName": "GitHub Actions",