microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-12-15 06:02:57 +03:00
Code Issues Projects Releases Wiki Activity

chore: clean up docker image (#10260)

Browse Source 
This patch:
- removes the Visual Regression bits from the images. These will
  probably be added back when it's ready for the prime time.
    * removes VNC && noVNC
    * removes Playwright Agent
- cleans up apt caches

This drops image size from 2.03GB to 1.91GB.
This commit is contained in:
Andrey Lushnikov 2021-11-11 15:35:57 -08:00 committed by GitHub
parent 24cfcf867e
commit 8ce6633937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
utils/docker/Dockerfile.bionic
View File

@ -5,41 +5,27 @@ ARG TZ=America/Los_Angeles
# === INSTALL Node.js === # === INSTALL Node.js ===
# Install node16 RUN apt-get update && \
RUN apt-get update && apt-get install -y curl && \ # Install node16
apt-get install -y curl && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get install -y nodejs apt-get install -y nodejs && \
# Feature-parity with node.js base images. # Feature-parity with node.js base images.
RUN apt-get update && apt-get install -y --no-install-recommends git ssh && \ apt-get install -y --no-install-recommends git openssh-client && \
npm install -g yarn npm install -g yarn && \
# Create the pwuser (we internally create a symlink for the pwuser and the root user) # Install Python 3.8
RUN adduser pwuser apt-get install -y python3.8 python3-pip && \
# Install Python 3.8
RUN apt-get update && apt-get install -y python3.8 python3-pip && \
update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 && \ update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 && \
# Install VNC & noVNC # clean apt cache
rm -rf /var/lib/apt/lists/* && \
ARG NOVNC_REF="1.2.0" # Create the pwuser (we internally create a symlink for the pwuser and the root user)
ARG WEBSOCKIFY_REF="0.10.0" adduser pwuser
RUN mkdir -p /opt/bin && chmod +x /dev/shm \
&& apt-get update && apt-get install -y unzip fluxbox x11vnc \
&& curl -L -o noVNC.zip "https://github.com/novnc/noVNC/archive/v${NOVNC_REF}.zip" \
&& unzip -x noVNC.zip \
&& mv noVNC-${NOVNC_REF} /opt/bin/noVNC \
&& cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
&& rm noVNC.zip \
&& curl -L -o websockify.zip "https://github.com/novnc/websockify/archive/v${WEBSOCKIFY_REF}.zip" \
&& unzip -x websockify.zip \
&& rm websockify.zip \
&& mv websockify-${WEBSOCKIFY_REF} /opt/bin/noVNC/utils/websockify
# === BAKE BROWSERS INTO IMAGE === # === BAKE BROWSERS INTO IMAGE ===
@ -49,7 +35,7 @@ ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
# The package should be built beforehand from tip-of-tree Playwright. # The package should be built beforehand from tip-of-tree Playwright.
COPY ./playwright-core.tar.gz /tmp/playwright-core.tar.gz COPY ./playwright-core.tar.gz /tmp/playwright-core.tar.gz
# 2. Install playwright agent. # 2. Bake in browsers & deps.
# Browsers will be downloaded in `/ms-playwright`. # Browsers will be downloaded in `/ms-playwright`.
# Note: make sure to set 777 to the registry so that any user can access # Note: make sure to set 777 to the registry so that any user can access
# registry. # registry.
@ -57,8 +43,7 @@ RUN mkdir /ms-playwright && \
mkdir /ms-playwright-agent && \ mkdir /ms-playwright-agent && \
cd /ms-playwright-agent && npm init -y && \ cd /ms-playwright-agent && npm init -y && \
npm i /tmp/playwright-core.tar.gz && \ npm i /tmp/playwright-core.tar.gz && \
npx playwright install --with-deps && \ npx playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \
rm /tmp/playwright-core.tar.gz && \ rm /tmp/playwright-core.tar.gz && \
rm -rf /ms-playwright-agent && \
chmod -R 777 /ms-playwright chmod -R 777 /ms-playwright
COPY start_agent.sh /ms-playwright-agent/start_agent.sh

50
utils/docker/Dockerfile.focal
View File

@ -5,41 +5,28 @@ ARG TZ=America/Los_Angeles
# === INSTALL Node.js === # === INSTALL Node.js ===
# Install node16 RUN apt-get update && \
RUN apt-get update && apt-get install -y curl && \
# Install node16
apt-get install -y curl && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get install -y nodejs apt-get install -y nodejs && \
# Feature-parity with node.js base images. # Feature-parity with node.js base images.
RUN apt-get update && apt-get install -y --no-install-recommends git ssh && \ apt-get install -y --no-install-recommends git openssh-client && \
npm install -g yarn npm install -g yarn && \
# Create the pwuser (we internally create a symlink for the pwuser and the root user) # Install Python 3.8
RUN adduser pwuser apt-get install -y python3.8 python3-pip && \
# Install Python 3.8
RUN apt-get update && apt-get install -y python3.8 python3-pip && \
update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 && \ update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 && \
# Install VNC & noVNC # clean apt cache
rm -rf /var/lib/apt/lists/* && \
ARG NOVNC_REF="1.2.0" # Create the pwuser
ARG WEBSOCKIFY_REF="0.10.0" adduser pwuser
RUN mkdir -p /opt/bin && chmod +x /dev/shm \
&& apt-get update && apt-get install -y unzip fluxbox x11vnc \
&& curl -L -o noVNC.zip "https://github.com/novnc/noVNC/archive/v${NOVNC_REF}.zip" \
&& unzip -x noVNC.zip \
&& mv noVNC-${NOVNC_REF} /opt/bin/noVNC \
&& cp /opt/bin/noVNC/vnc.html /opt/bin/noVNC/index.html \
&& rm noVNC.zip \
&& curl -L -o websockify.zip "https://github.com/novnc/websockify/archive/v${WEBSOCKIFY_REF}.zip" \
&& unzip -x websockify.zip \
&& rm websockify.zip \
&& mv websockify-${WEBSOCKIFY_REF} /opt/bin/noVNC/utils/websockify
# === BAKE BROWSERS INTO IMAGE === # === BAKE BROWSERS INTO IMAGE ===
@ -49,7 +36,7 @@ ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
# The package should be built beforehand from tip-of-tree Playwright. # The package should be built beforehand from tip-of-tree Playwright.
COPY ./playwright-core.tar.gz /tmp/playwright-core.tar.gz COPY ./playwright-core.tar.gz /tmp/playwright-core.tar.gz
# 2. Install playwright agent. # 2. Bake in browsers & deps.
# Browsers will be downloaded in `/ms-playwright`. # Browsers will be downloaded in `/ms-playwright`.
# Note: make sure to set 777 to the registry so that any user can access # Note: make sure to set 777 to the registry so that any user can access
# registry. # registry.
@ -57,8 +44,7 @@ RUN mkdir /ms-playwright && \
mkdir /ms-playwright-agent && \ mkdir /ms-playwright-agent && \
cd /ms-playwright-agent && npm init -y && \ cd /ms-playwright-agent && npm init -y && \
npm i /tmp/playwright-core.tar.gz && \ npm i /tmp/playwright-core.tar.gz && \
npx playwright install --with-deps && \ npx playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \
rm /tmp/playwright-core.tar.gz && \ rm /tmp/playwright-core.tar.gz && \
rm -rf /ms-playwright-agent && \
chmod -R 777 /ms-playwright chmod -R 777 /ms-playwright
COPY start_agent.sh /ms-playwright-agent/start_agent.sh