diff --git a/.github/workflows/publish_canary.yml b/.github/workflows/publish_canary.yml index 2524a522ab..6c9eb046e0 100644 --- a/.github/workflows/publish_canary.yml +++ b/.github/workflows/publish_canary.yml @@ -13,7 +13,7 @@ env: jobs: publish-canary: - name: "publish canary NPM & Publish canary Docker" + name: "publish canary NPM" runs-on: ubuntu-20.04 if: github.repository == 'microsoft/playwright' permissions: @@ -57,17 +57,6 @@ jobs: run: | utils/build/build-playwright-driver.sh utils/build/upload-playwright-driver.sh - - uses: azure/docker-login@v1 - with: - login-server: playwright.azurecr.io - username: playwright - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up Docker QEMU for arm64 docker builds - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 - - name: publish docker canary - run: ./utils/docker/publish_docker.sh canary publish-trace-viewer: name: "publish Trace Viewer to trace.playwright.dev" diff --git a/.github/workflows/publish_release_docker.yml b/.github/workflows/publish_release_docker.yml index 65ae24442c..bc836960f1 100644 --- a/.github/workflows/publish_release_docker.yml +++ b/.github/workflows/publish_release_docker.yml @@ -17,7 +17,7 @@ env: jobs: publish-docker-release: name: "publish to DockerHub" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.repository == 'microsoft/playwright' steps: - uses: actions/checkout@v4 @@ -31,7 +31,7 @@ jobs: username: playwright password: ${{ secrets.DOCKER_PASSWORD }} - name: Set up Docker QEMU for arm64 docker builds - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: arm64 - run: npm ci diff --git a/docs/src/docker.md b/docs/src/docker.md index a171f60a0d..f0ec7d8621 100644 --- a/docs/src/docker.md +++ b/docs/src/docker.md @@ -113,8 +113,6 @@ We currently publish images with the following tags: - `:v%%VERSION%%` - Playwright v%%VERSION%% release docker image based on Ubuntu 22.04 LTS (Jammy Jellyfish). - `:v%%VERSION%%-jammy` - Playwright v%%VERSION%% release docker image based on Ubuntu 22.04 LTS (Jammy Jellyfish). - `:v%%VERSION%%-focal` - Playwright v%%VERSION%% release docker image based on Ubuntu 20.04 LTS (Focal Fossa). -- `:sha-XXXXXXX` - docker image for every commit that changed - docker files or browsers, marked with a [short sha](https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Short-SHA-1) (first 7 digits of the SHA commit). :::note It is recommended to always pin your Docker image to a specific version if possible. If the Playwright version in your Docker image does not match the version in your project/tests, Playwright will be unable to locate browser executables. diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh index dcb77e943e..8f2d1910fd 100755 --- a/utils/docker/publish_docker.sh +++ b/utils/docker/publish_docker.sh @@ -26,14 +26,8 @@ else exit 1 fi -if [[ -z "${GITHUB_SHA}" ]]; then - echo "ERROR: GITHUB_SHA env variable must be specified" - exit 1 -fi - FOCAL_TAGS=( "next" - "sha-${GITHUB_SHA}" "next-focal" "v${PW_VERSION}-focal" )