From f332a536b15fbee958ba4e020b4e93cf275e5ccd Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Tue, 30 Mar 2021 13:09:14 -0700
Subject: [PATCH] devops: use install-deps in docker file (#378)

---
 Dockerfile.focal | 113 +----------------------------------------------
 1 file changed, 2 insertions(+), 111 deletions(-)

diff --git a/Dockerfile.focal b/Dockerfile.focal
index 90c6981f..396086a6 100644
--- a/Dockerfile.focal
+++ b/Dockerfile.focal
@@ -1,116 +1,5 @@
 FROM ubuntu:focal
 
-# === GENERATED BROWSER DEPENDENCIES ===
-
-# (generated with ./updateDockerDeps.js)
-
-# tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    xvfb
-
-# chromium
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    fonts-liberation\
-    libasound2\
-    libatk-bridge2.0-0\
-    libatk1.0-0\
-    libatspi2.0-0\
-    libcairo2\
-    libcups2\
-    libdbus-1-3\
-    libdrm2\
-    libgbm1\
-    libglib2.0-0\
-    libgtk-3-0\
-    libnspr4\
-    libnss3\
-    libpango-1.0-0\
-    libx11-6\
-    libxcb1\
-    libxcomposite1\
-    libxdamage1\
-    libxext6\
-    libxfixes3\
-    libxrandr2
-
-# firefox
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ffmpeg\
-    libatk1.0-0\
-    libcairo-gobject2\
-    libcairo2\
-    libdbus-1-3\
-    libdbus-glib-1-2\
-    libfontconfig1\
-    libfreetype6\
-    libgdk-pixbuf2.0-0\
-    libglib2.0-0\
-    libgtk-3-0\
-    libpango-1.0-0\
-    libpangocairo-1.0-0\
-    libpangoft2-1.0-0\
-    libx11-6\
-    libx11-xcb1\
-    libxcb-shm0\
-    libxcb1\
-    libxcomposite1\
-    libxcursor1\
-    libxdamage1\
-    libxext6\
-    libxfixes3\
-    libxi6\
-    libxrender1\
-    libxt6
-
-# webkit
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    gstreamer1.0-libav\
-    gstreamer1.0-plugins-bad\
-    gstreamer1.0-plugins-base\
-    gstreamer1.0-plugins-good\
-    libatk-bridge2.0-0\
-    libatk1.0-0\
-    libcairo2\
-    libegl1\
-    libenchant1c2a\
-    libepoxy0\
-    libfontconfig1\
-    libfreetype6\
-    libgdk-pixbuf2.0-0\
-    libgl1\
-    libgles2\
-    libglib2.0-0\
-    libgstreamer-gl1.0-0\
-    libgstreamer1.0-0\
-    libgtk-3-0\
-    libharfbuzz-icu0\
-    libharfbuzz0b\
-    libhyphen0\
-    libicu66\
-    libjpeg-turbo8\
-    libnotify4\
-    libopenjp2-7\
-    libopus0\
-    libpango-1.0-0\
-    libpng16-16\
-    libsecret-1-0\
-    libsoup2.4-1\
-    libvpx6\
-    libwayland-client0\
-    libwayland-egl1\
-    libwayland-server0\
-    libwebp6\
-    libwebpdemux2\
-    libwoff1\
-    libx11-6\
-    libxcomposite1\
-    libxdamage1\
-    libxkbcommon0\
-    libxml2\
-    libxslt1.1
-
-# === GENERATED BROWSER DEPENDENCIES END ===
-
 # === INSTALL JDK and Maven ===
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -136,6 +25,8 @@ COPY . /tmp/pw-java
 RUN cd /tmp/pw-java && \
     ./scripts/download_driver_for_all_platforms.sh && \
     mvn install -D skipTests --no-transfer-progress && \
+    DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
+                     -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \
     mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="install" -f playwright/pom.xml --no-transfer-progress && \
     rm -rf /tmp/pw-java