Skip to content

Commit ad18847

Browse files
authored
fix: remove external_links and links (#79)
1 parent 0ce5856 commit ad18847

File tree

3 files changed

+9
-33
lines changed

3 files changed

+9
-33
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ Functional and FunctionalJavascript tests require the `drupal/core-dev` Composer
2222
ddev composer require drupal/core-dev
2323
```
2424

25-
> [!NOTE]
26-
> Run `ddev add-on get ddev/ddev-selenium-standalone-chrome` after changes to `name`, `additional_hostnames`, `additional_fqdns`, or `project_tld` in `.ddev/config.yaml` so that `.ddev/docker-compose.selenium-chrome_extras.yaml` is regenerated.
27-
2825
After installation, make sure to commit the `.ddev` directory to version control.
2926

3027
### Optional steps

docker-compose.selenium-chrome.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- VNC_NO_PASSWORD=1
2020
# Enables multiple parallel connections to the Selenium.
2121
- SE_NODE_MAX_SESSIONS=12
22-
- SE_NODE_OVERRIDE_MAX_SESSIONS=true
22+
- SE_NODE_OVERRIDE_MAX_SESSIONS=true
2323
# To enable VNC access for traditional VNC clients like macOS "Screen Sharing",
2424
# uncomment the following two lines.
2525
#ports:
@@ -31,7 +31,3 @@ services:
3131
# To enable file uploads in E2E tests.
3232
- ${DDEV_APPROOT}:/var/www/html:r
3333
- ".:/mnt/ddev_config"
34-
35-
web:
36-
links:
37-
- selenium-chrome

install.yaml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,14 @@ ddev_version_constraint: '>= v1.24.10'
88

99
post_install_actions:
1010
- |
11-
#ddev-description:Checking docker-compose.selenium-chrome_extras.yaml for changes
12-
if [ -f docker-compose.selenium-chrome_extras.yaml ] && ! grep -q '#ddev-generated' docker-compose.selenium-chrome_extras.yaml; then
13-
echo "Existing docker-compose.selenium-chrome_extras.yaml does not have #ddev-generated, so can't be updated"
14-
exit 2
15-
fi
16-
- |
17-
#ddev-description:Adding all hostnames to the selenium-chrome container to make them available
18-
cat <<-END >docker-compose.selenium-chrome_extras.yaml
19-
#ddev-generated
20-
services:
21-
selenium-chrome:
22-
external_links:
23-
{{- $selenium_chrome_hostnames := splitList "," (env "DDEV_HOSTNAME") -}}
24-
{{- range $i, $n := $selenium_chrome_hostnames }}
25-
- "ddev-router:{{- replace (env "DDEV_TLD") "\\${DDEV_TLD}" (replace (env "DDEV_PROJECT") "\\${DDEV_PROJECT}" $n) -}}"
26-
{{- end }}
27-
END
28-
29-
removal_actions:
30-
- |
31-
#ddev-description:Remove docker-compose.selenium-chrome_extras.yaml file
32-
if [ -f docker-compose.selenium-chrome_extras.yaml ]; then
33-
if grep -q '#ddev-generated' docker-compose.selenium-chrome_extras.yaml; then
34-
rm -f docker-compose.selenium-chrome_extras.yaml
11+
#ddev-description:Checking for obsolete docker-compose.selenium-chrome_extras.yaml
12+
file="$DDEV_APPROOT/.ddev/docker-compose.selenium-chrome_extras.yaml"
13+
if [ -f "$file" ]; then
14+
if grep -q '#ddev-generated' "$file"; then
15+
echo "Removing existing docker-compose.selenium-chrome_extras.yaml, it's not needed anymore."
16+
rm -f "$file"
3517
else
36-
echo "Unwilling to remove '$DDEV_APPROOT/.ddev/docker-compose.selenium-chrome_extras.yaml' because it does not have #ddev-generated in it; you can manually delete it if it is safe to delete."
18+
echo "Unwilling to remove '$file' because it does not have #ddev-generated in it; please remove it manually."
19+
exit 1
3720
fi
3821
fi

0 commit comments

Comments
 (0)