Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Correctly patching google-chrome script in new packages (fixes #663) #664

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion static/chrome/apt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 7 additions & 1 deletion static/chrome/local/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ RUN \
libxrender1 \
libxss1 \
libxtst6 \
libgbm1 \
libu2f-udev \
libvulkan1 \
ca-certificates \
fonts-liberation \
libappindicator3-1 \
Expand All @@ -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 && \
Expand Down
Loading