From 4417a97482a42a5e44bbbe8171037249d5c70faf Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Wed, 24 May 2023 12:16:59 -0700 Subject: [PATCH] cherry-pick(#23260): chore: move to npx playwright-core install when using core --- packages/playwright-core/package.json | 2 +- utils/docker/Dockerfile.focal | 4 ++-- utils/docker/Dockerfile.jammy | 4 ++-- utils/linux-browser-dependencies/inside_docker/process.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/playwright-core/package.json b/packages/playwright-core/package.json index c3e7f59af6..7239c33891 100644 --- a/packages/playwright-core/package.json +++ b/packages/playwright-core/package.json @@ -36,7 +36,7 @@ "./types/structs": "./types/structs.d.ts" }, "bin": { - "playwright": "./cli.js" + "playwright-core": "./cli.js" }, "types": "types/types.d.ts" } diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal index e870a5e460..cdc8dd5bde 100644 --- a/utils/docker/Dockerfile.focal +++ b/utils/docker/Dockerfile.focal @@ -37,7 +37,7 @@ RUN mkdir /ms-playwright && \ mkdir /ms-playwright-agent && \ cd /ms-playwright-agent && npm init -y && \ npm i /tmp/playwright-core.tar.gz && \ - npx playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ - npx playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ + npx playwright-core mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ + npx playwright-core install --with-deps && rm -rf /var/lib/apt/lists/* && \ rm /tmp/playwright-core.tar.gz && \ chmod -R 777 /ms-playwright diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy index 57507a1870..c088142b3e 100644 --- a/utils/docker/Dockerfile.jammy +++ b/utils/docker/Dockerfile.jammy @@ -35,8 +35,8 @@ RUN mkdir /ms-playwright && \ mkdir /ms-playwright-agent && \ cd /ms-playwright-agent && npm init -y && \ npm i /tmp/playwright-core.tar.gz && \ - npx playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ - npx playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ + npx playwright-core mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ + npx playwright-core install --with-deps && rm -rf /var/lib/apt/lists/* && \ rm /tmp/playwright-core.tar.gz && \ rm -rf /ms-playwright-agent && \ chmod -R 777 /ms-playwright diff --git a/utils/linux-browser-dependencies/inside_docker/process.sh b/utils/linux-browser-dependencies/inside_docker/process.sh index 2fa85035c5..b49c7a97fb 100755 --- a/utils/linux-browser-dependencies/inside_docker/process.sh +++ b/utils/linux-browser-dependencies/inside_docker/process.sh @@ -12,7 +12,7 @@ apt-get update && apt-get install -y curl && \ apt-get update && apt-get install -y apt-file && apt-file update # Install tip-of-tree playwright-core and browsers -mkdir /root/tmp && cd /root/tmp && npm init -y && npm i /root/hostfolder/playwright-core.tar.gz && npx playwright install +mkdir /root/tmp && cd /root/tmp && npm init -y && npm i /root/hostfolder/playwright-core.tar.gz && npx playwright-core install cp /root/hostfolder/inside_docker/list_dependencies.js /root/tmp/list_dependencies.js