bump playwright

Author: cyrus

.gitignore

@@ -24,4 +24,6 @@ coverage
 .eslintcache
 
 # Misc
-.DS_Store
+.DS_Store
+
+build/*

Dockerfile

@@ -1,13 +1,22 @@
-FROM playwright/package
+FROM playwright/base
+
+ENV NODE_ENV=production
+
+USER pwuser
+
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 WORKDIR /home/pwuser
 
-COPY package*.json ./
+ARG NPM_LOGLEVEL=info
 
 COPY . .
 
+RUN rm yarn.lock
+
+RUN npm install --loglevel ${NPM_LOGLEVEL} --force
+
 CMD [ "node", "build/src/main.js" ]
 
 EXPOSE 3000/tcp
 
-

Dockerfile.base

@@ -1,82 +1 @@
-FROM ubuntu:bionic
-
-RUN apt-get update && apt-get install -y curl && \
-  curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
-  apt-get install -y nodejs
-
-# 2. Install WebKit dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  libwoff1 \
-  libopus0 \
-  libwebp6 \
-  libwebpdemux2 \
-  libenchant1c2a \
-  libgudev-1.0-0 \
-  libsecret-1-0 \
-  libhyphen0 \
-  libgdk-pixbuf2.0-0 \
-  libegl1 \
-  libnotify4 \
-  libxslt1.1 \
-  libevent-2.1-6 \
-  libgles2 \
-  libvpx5 \
-  libxcomposite1 \
-  libatk1.0-0 \
-  libatk-bridge2.0-0 \
-  libepoxy0 \
-  libgtk-3-0 \
-  libharfbuzz-icu0
-
-# 3. Install gstreamer and plugins to support video playback in WebKit.
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  libgstreamer-gl1.0-0 \
-  libgstreamer-plugins-bad1.0-0 \
-  gstreamer1.0-plugins-good \
-  gstreamer1.0-libav
-
-# 4. Install Chromium dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  libnss3 \
-  libxss1 \
-  libasound2 \
-  libxtst6
-
-# 5. Install Firefox dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  libdbus-glib-1-2 \
-  libxt6
-
-# 6. Install ffmpeg to bring in audio and video codecs necessary for playing videos in Firefox.
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  ffmpeg
-
-# 7. (Optional) Install XVFB if there's a need to run browsers in headful mode
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  xvfb
-
-# 8. Feature-parity with node.js base images.
-RUN apt-get update && apt-get install -y --no-install-recommends git ssh && \
-  npm install -g yarn
-
-# Install fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai ...)
-RUN  apt-get install -y \
-  fonts-freefont-ttf \
-  fonts-ipafont-gothic \
-  fonts-kacst \
-  fonts-liberation \
-  fonts-noto-color-emoji \
-  fonts-thai-tlwg \
-  fonts-wqy-zenhei \
-  --no-install-recommends
-
-# Cleanup
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Add user so we don't need --no-sandbox.
-RUN groupadd -r pwuser && useradd -r -g pwuser -G audio,video pwuser \
-  && mkdir -p /home/pwuser/Downloads \
-  && chown -R pwuser:pwuser /home/pwuser
-
-# Run everything after as non-privileged user.
-USER pwuser
+FROM mcr.microsoft.com/playwright:v1.16.3-focal

Dockerfile.package

@@ -144,36 +144,14 @@ Set this value if browser server need to be close after specified time.
 ## Build All
 
 ```
-
 npm run build
-docker build --rm -f Dockerfile.base -t playwright/base .
-docker build --rm -f Dockerfile.package -t playwright/package .
-docker build --rm -f Dockerfile -t playwright/server .
-
-```
 
-## Update playwright
-
-Before update make sure to stop `playwright/server` container and remove both `playwright/server` and 'playwright/package' images.
-
-Update to the latest playwright version:
-
-```
+Important: Change playwright version in Dockerfile.base to match installed package
 
-npm run build
-docker build --rm -f Dockerfile.package -t playwright/package .
-docker build --rm -f Dockerfile -t playwright/server .
-
-```
-
-Update to the specific playwright version:
+docker build --rm -f Dockerfile.base -t playwright/base .
+docker build --progress=plain --rm -f Dockerfile -t playwright/server .
 
 ```
-docker build --rm -f Dockerfile.package -t playwright/package --build-arg  PLAYWRIGHT_VERSION=0.11.1 .
-docker build --rm -f Dockerfile -t playwright/server .
-```
-
-> To set nodejs --loglevel use NPM_LOGLEVEL variable
 
 ## Debugging