Skip to content

cherry-pick(#17896): chore: make local docker build work on branch #17906

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

Merged
dgozman merged 2 commits into from
Oct 7, 2022
+6 −7
Merged

cherry-pick(#17896): chore: make local docker build work on branch #17906

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570492a
cherry-pick(#17896): chore: make local docker build work on branch
dgozman Oct 7, 2022
3bdfeb2
cherry-pick(#17908): chore: fix docker tests in branch, attempt 2
dgozman Oct 7, 2022
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
13 changes: 6 additions & 7 deletions packages/playwright-core/src/containers/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ async function deletePlaywrightImage() {
async function buildPlaywrightImage() {
await checkDockerEngineIsRunningOrDie();

const isDevelopmentMode = getPlaywrightVersion().includes('next');
let baseImageName = `mcr.microsoft.com/playwright:v${getPlaywrightVersion()}-${VRT_IMAGE_DISTRO}`;
// 1. Build or pull base image.
if (isDevelopmentMode) {
// Use our docker build scripts in development mode!
if (!process.env.PWTEST_DOCKER_BASE_IMAGE) {
let baseImageName = process.env.PWTEST_DOCKER_BASE_IMAGE || '';
if (!baseImageName) {
const isDevelopmentMode = getPlaywrightVersion().includes('next');
if (isDevelopmentMode) {
// Use our docker build scripts in development mode!
const arch = process.arch === 'arm64' ? '--arm64' : '--amd64';
throw createStacklessError(utils.wrapInASCIIBox([
`You are in DEVELOPMENT mode!`,
Expand All @@ -91,8 +91,7 @@ async function buildPlaywrightImage() {
` PWTEST_DOCKER_BASE_IMAGE=playwright:localbuild npx playwright docker build`,
].join('\n'), 1));
}
baseImageName = process.env.PWTEST_DOCKER_BASE_IMAGE;
} else {
baseImageName = `mcr.microsoft.com/playwright:v${getPlaywrightVersion()}-${VRT_IMAGE_DISTRO}`;
const { code } = await spawnAsync('docker', ['pull', baseImageName], { stdio: 'inherit' });
if (code !== 0)
throw new Error('Failed to pull docker image!');
Expand Down