diff --git a/Dockerfile.playwright b/Dockerfile.playwright index b2056dfc94..be8aef45f0 100644 --- a/Dockerfile.playwright +++ b/Dockerfile.playwright @@ -2,4 +2,5 @@ ARG PLAYWRIGHT_VERSION FROM mcr.microsoft.com/playwright:v${PLAYWRIGHT_VERSION}-focal -RUN npm install -g pnpm +COPY package.json . +RUN npm install -g $(grep packageManager package.json | awk '{print $2}' | sed 's/[",]//g') diff --git a/bin/playwright.sh b/bin/playwright.sh index 275e425ef3..dc619b74a2 100755 --- a/bin/playwright.sh +++ b/bin/playwright.sh @@ -11,4 +11,4 @@ export TEST_COMMAND=${TEST_COMMAND:-test:playwright:local} echo Running Playwright v$PLAYWRIGHT_VERSION as $USER_ID with Playwright arguments $PLAYWRIGHT_ARGS -docker-compose -f docker-compose.playwright.yml up --build --force-recreate --abort-on-container-exit --exit-code-from playwright +docker-compose -f docker-compose.playwright.yml up --build --force-recreate --abort-on-container-exit --exit-code-from playwright --remove-orphans diff --git a/docker-compose.playwright.yml b/docker-compose.playwright.yml index d768d9d4f1..765233b2d9 100644 --- a/docker-compose.playwright.yml +++ b/docker-compose.playwright.yml @@ -10,7 +10,7 @@ services: - .:/app user: ${USER_ID} working_dir: /app - command: pnpm ${TEST_COMMAND} -- ${PLAYWRIGHT_ARGS:-} + command: pnpm ${TEST_COMMAND} ${PLAYWRIGHT_ARGS:-} environment: # This makes the webserver that Playwright runs show the build - DEBUG=pw:webserver diff --git a/src/components/VAudioDetails/VAudioDetails.vue b/src/components/VAudioDetails/VAudioDetails.vue index c57f80d3d8..2c34dc00df 100644 --- a/src/components/VAudioDetails/VAudioDetails.vue +++ b/src/components/VAudioDetails/VAudioDetails.vue @@ -1,7 +1,7 @@