Skip to content

add host-gateway only when docker server is >= v20 #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafern14 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add host-gateway only when docker server is >= v20 #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45fb2d3
add host-gateway only when docker server is >= v20
May 26, 2023
60660cd
Update yarn.lock
oblador Oct 31, 2023
1f99a38
Merge branch 'master' into docker-backwards-compat
oblador Oct 31, 2023
364ea9a
Merge branch 'master' into docker-backwards-compat
oblador Oct 31, 2023
56f8b66
Merge branch 'master' into docker-backwards-compat
oblador Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/target-chrome-docker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"execa": "^5.0.0",
"find-free-port-sync": "^1.0.0",
"fs-extra": "^9.1.0",
"semver": "^7.5.1",
"wait-on": "^5.2.1"
},
"publishConfig": {
Expand Down
13 changes: 12 additions & 1 deletion packages/target-chrome-docker/src/create-chrome-docker-target.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const execa = require('execa');
const waitOn = require('wait-on');
const CDP = require('chrome-remote-interface');
const getRandomPort = require('find-free-port-sync');
const semver = require('semver');
const {
ChromeError,
ensureDependencyAvailable,
Expand Down Expand Up @@ -64,7 +65,6 @@ function createChromeDockerTarget({
if (!chromeDockerWithoutSeccomp) {
runArgs.push('--security-opt=seccomp=unconfined');
}
runArgs.push('--add-host=host.docker.internal:host-gateway');

if (dockerUrl.indexOf('http://localhost') === 0 || isLocalFile) {
const ip = getLocalIPAddress();
Expand Down Expand Up @@ -135,6 +135,17 @@ function createChromeDockerTarget({
])
.concat(chromeFlags);

const { stdout: rawDockerVersion } = await execa('docker', [
'version',
'--format',
"'{{.Server.Version}}'",
]);
const parsedDockerVersion = rawDockerVersion.replace(/'/g, '');

if (semver.satisfies(parsedDockerVersion, '>=20')) {
dockerArgs.push('--add-host=host.docker.internal:host-gateway');
}

debug(
`Launching chrome in docker with command "${dockerPath} ${args.join(
' '
Expand Down
7 changes: 7 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18990,6 +18990,13 @@ semver@^7.3.4, semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"

semver@^7.5.1:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"

semver@~5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
Expand Down