From 64dde2978878d6d0548aadd0ae6497c9400ffe97 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Wed, 24 May 2023 12:16:59 -0700 Subject: [PATCH] chore: move to npx playwright-core install when using core (#23260) --- 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 bc47c98c11..5fdd881faf 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 4a9811d850..2ba495eb38 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 && \ - npm exec --no -- playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ - npm exec --no -- playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ + npm exec --no -- playwright-core mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ + npm exec --no -- 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 ca282ce18e..c6224b6773 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 && \ - npm exec --no -- playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ - npm exec --no -- playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ + npm exec --no -- playwright-core mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ + npm exec --no -- 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