Merge pull request #664 from vania-pooh/master

Correctly patching google-chrome script in new packages (fixes #663)
aerokube · Jan 15, 2024 · 4fa724f · 4fa724f
2 parents cad2094 + 3095135
commit 4fa724f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/static/chrome/apt/Dockerfile b/static/chrome/apt/Dockerfile
@@ -11,7 +11,10 @@ RUN \
         echo 'deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/google.list && \
         apt-get update && \
         apt-get -y --no-install-recommends install iproute2 $PACKAGE=$VERSION && \
-        sed -i -e 's@exec -a "$0" "$HERE/chrome"@& --no-sandbox --disable-gpu@' /opt/google/$INSTALL_DIR/google-chrome && \
+         ( \
+          sed -i -e 's@exec -a "$0" "$HERE/chrome"@& --no-sandbox --disable-gpu@' /opt/google/$INSTALL_DIR/$PACKAGE || \
+          sed -i -e 's@exec -a "$0" "$HERE/chrome"@& --no-sandbox --disable-gpu@' /opt/google/$INSTALL_DIR/google-chrome \
+         ) && \
         chown root:root /opt/google/$INSTALL_DIR/chrome-sandbox && \
         chmod 4755 /opt/google/$INSTALL_DIR/chrome-sandbox && \
         google-chrome --version && \

diff --git a/static/chrome/local/Dockerfile b/static/chrome/local/Dockerfile
@@ -41,6 +41,9 @@ RUN \
          libxrender1 \
          libxss1 \
          libxtst6 \
+         libgbm1 \
+         libu2f-udev \
+         libvulkan1 \
          ca-certificates \
          fonts-liberation \
          libappindicator3-1 \
@@ -53,7 +56,10 @@ RUN \
          curl -O http://host.docker.internal:8080/google-chrome.deb && \
          apt-get -y purge curl && \
          dpkg -i google-chrome.deb && \
-         sed -i -e 's@exec -a "$0" "$HERE/chrome"@& --no-sandbox --disable-gpu@' /opt/google/$INSTALL_DIR/$PACKAGE && \
+         ( \
+          sed -i -e 's@exec -a "$0" "$HERE/chrome"@& --no-sandbox --disable-gpu@' /opt/google/$INSTALL_DIR/$PACKAGE || \
+          sed -i -e 's@exec -a "$0" "$HERE/chrome"@& --no-sandbox --disable-gpu@' /opt/google/$INSTALL_DIR/google-chrome \
+         ) && \
          rm google-chrome.deb && \
          chown root:root /opt/google/$INSTALL_DIR/chrome-sandbox && \
          chmod 4755 /opt/google/$INSTALL_DIR/chrome-sandbox && \