From df97338f85c21a594f087996b9fc0f06305d7b3d Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 11 Apr 2022 13:16:02 -0700 Subject: [PATCH 1/5] Update Dockerfile.focal --- utils/docker/Dockerfile.focal | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal index 1aae632be..fb9fcc2ae 100644 --- a/utils/docker/Dockerfile.focal +++ b/utils/docker/Dockerfile.focal @@ -2,6 +2,7 @@ FROM ubuntu:focal ARG DEBIAN_FRONTEND=noninteractive ARG TZ=America/Los_Angeles +ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/python:v%version%-focal" # === INSTALL Python === @@ -39,6 +40,7 @@ RUN mkdir /ms-playwright && \ # if its arm64 then install the manylinux1_aarch64 pip package if [ "$(uname -m)" = "aarch64" ]; then pip install /tmp/*manylinux_2_17_aarch64*.whl; fi && \ playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ + playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ rm /tmp/*.whl && \ rm -rf /ms-playwright-agent && \ chmod -R 777 /ms-playwright From 3e82cf859f7dc3d3101010f06892ebd2460f5a77 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 11 Apr 2022 13:16:55 -0700 Subject: [PATCH 2/5] Update Dockerfile.bionic --- utils/docker/Dockerfile.bionic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/docker/Dockerfile.bionic b/utils/docker/Dockerfile.bionic index ae2aec395..a673e9130 100644 --- a/utils/docker/Dockerfile.bionic +++ b/utils/docker/Dockerfile.bionic @@ -2,6 +2,7 @@ FROM ubuntu:bionic ARG DEBIAN_FRONTEND=noninteractive ARG TZ=America/Los_Angeles +ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/python:v%version%-bionic" # === INSTALL Python === @@ -38,6 +39,7 @@ RUN mkdir /ms-playwright && \ if [ "$(uname -m)" = "x86_64" ]; then pip install /tmp/*manylinux1_x86_64*.whl; fi && \ # if its arm64 then install the manylinux1_aarch64 pip package if [ "$(uname -m)" = "aarch64" ]; then pip install /tmp/*manylinux_2_17_aarch64*.whl; fi && \ + npx playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ rm /tmp/*.whl && \ rm -rf /ms-playwright-agent && \ From 70af4fc3a99d00d1ff09372625e2ab109ab9df94 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 11 Apr 2022 13:17:11 -0700 Subject: [PATCH 3/5] Update Dockerfile.focal --- utils/docker/Dockerfile.focal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal index fb9fcc2ae..4cb0c62ca 100644 --- a/utils/docker/Dockerfile.focal +++ b/utils/docker/Dockerfile.focal @@ -39,8 +39,8 @@ RUN mkdir /ms-playwright && \ if [ "$(uname -m)" = "x86_64" ]; then pip install /tmp/*manylinux1_x86_64*.whl; fi && \ # if its arm64 then install the manylinux1_aarch64 pip package if [ "$(uname -m)" = "aarch64" ]; then pip install /tmp/*manylinux_2_17_aarch64*.whl; fi && \ - playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ + playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ rm /tmp/*.whl && \ rm -rf /ms-playwright-agent && \ chmod -R 777 /ms-playwright From 1f34fd0644f6795a3d47bb90f6695eec64ba03c6 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 11 Apr 2022 13:19:12 -0700 Subject: [PATCH 4/5] Update Dockerfile.bionic --- utils/docker/Dockerfile.bionic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/docker/Dockerfile.bionic b/utils/docker/Dockerfile.bionic index a673e9130..3e2f0709a 100644 --- a/utils/docker/Dockerfile.bionic +++ b/utils/docker/Dockerfile.bionic @@ -39,7 +39,7 @@ RUN mkdir /ms-playwright && \ if [ "$(uname -m)" = "x86_64" ]; then pip install /tmp/*manylinux1_x86_64*.whl; fi && \ # if its arm64 then install the manylinux1_aarch64 pip package if [ "$(uname -m)" = "aarch64" ]; then pip install /tmp/*manylinux_2_17_aarch64*.whl; fi && \ - npx playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ + playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \ playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \ rm /tmp/*.whl && \ rm -rf /ms-playwright-agent && \ From 8b4b51022c7c2577f6be1b2beaed52f82bc30d01 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Tue, 12 Apr 2022 00:07:47 +0200 Subject: [PATCH 5/5] Update test_docker.yml --- .github/workflows/test_docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index b6978067f..1b5738cff 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -4,6 +4,7 @@ on: paths: - '.github/workflows/test_docker.yml' - 'setup.py' + - '**/Dockerfile.*' branches: - main - release-* @@ -11,6 +12,7 @@ on: paths: - '.github/workflows/test_docker.yml' - 'setup.py' + - '**/Dockerfile.*' branches: - main - release-*