From 92132d2ea07465ece91e526e245096df20e2001c Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 1 Mar 2021 17:24:07 -0800 Subject: [PATCH] cherry-pick(release-1.9): fix registry to be accessible by Azure Pipelines user (#5672) This cherry-picks f637b0302dd651e2e6310f13cba9998a2730ede0 References #5635 --- utils/docker/Dockerfile.bionic | 12 +++++++----- utils/docker/Dockerfile.focal | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/utils/docker/Dockerfile.bionic b/utils/docker/Dockerfile.bionic index ee068f0066..0cd8fb57e7 100644 --- a/utils/docker/Dockerfile.bionic +++ b/utils/docker/Dockerfile.bionic @@ -79,15 +79,17 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \ ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright -RUN mkdir /ms-playwright && chmod 777 /ms-playwright - # 1. Add tip-of-tree Playwright package to install its browsers. # The package should be built beforehand from tip-of-tree Playwright. COPY ./playwright.tar.gz /tmp/playwright.tar.gz # 2. Install playwright and then delete the installation. # Browsers will remain downloaded in `/ms-playwright`. -RUN su pwuser -c "mkdir /tmp/pw && cd /tmp/pw && npm init -y && \ - npm i /tmp/playwright.tar.gz" && \ - rm -rf /tmp/pw && rm /tmp/playwright.tar.gz +# Note: make sure to set 777 to the registry so that any user can access +# registry. +RUN mdkir /ms-playwright && \ + mkdir /tmp/pw && cd /tmp/pw && npm init -y && \ + npm i /tmp/playwright.tar.gz && \ + rm -rf /tmp/pw && rm /tmp/playwright.tar.gz && \ + chmod -R 777 /ms-playwright diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal index 8885de1c2c..37a935df53 100644 --- a/utils/docker/Dockerfile.focal +++ b/utils/docker/Dockerfile.focal @@ -78,15 +78,17 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \ ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright -RUN mkdir /ms-playwright && chmod 777 /ms-playwright - # 1. Add tip-of-tree Playwright package to install its browsers. # The package should be built beforehand from tip-of-tree Playwright. COPY ./playwright.tar.gz /tmp/playwright.tar.gz # 2. Install playwright and then delete the installation. # Browsers will remain downloaded in `/ms-playwright`. -RUN su pwuser -c "mkdir /tmp/pw && cd /tmp/pw && npm init -y && \ - npm i /tmp/playwright.tar.gz" && \ - rm -rf /tmp/pw && rm /tmp/playwright.tar.gz +# Note: make sure to set 777 to the registry so that any user can access +# registry. +RUN mdkir /ms-playwright && \ + mkdir /tmp/pw && cd /tmp/pw && npm init -y && \ + npm i /tmp/playwright.tar.gz && \ + rm -rf /tmp/pw && rm /tmp/playwright.tar.gz && \ + chmod -R 777 /ms-playwright