Skip to content

Commit dbaf6b0

Browse files
committed
upgrade
1 parent 364770e commit dbaf6b0

File tree

2 files changed

+47
-2
lines changed

2 files changed

+47
-2
lines changed

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ FROM python:3.6
33
RUN apt-get update && apt-get install wget -y
44
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
55
RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
6-
RUN apt-get update && apt-get install google-chrome-stable zip -y
6+
RUN apt-get update && apt-get install google-chrome-stable zip ttf-wqy-microhei -y
77

88
RUN wget https://chromedriver.storage.googleapis.com/2.45/chromedriver_linux64.zip && \
99
unzip chromedriver_linux64.zip && rm -f chromedriver_linux64.zip && \
10-
chmod +777 chromedriver && mv -f chromedriver /usr/bin/chromedriver
10+
mv -f chromedriver /usr/bin/chromedriver && chmod +777 /usr/bin/chromedriver
11+
12+
COPY google-chrome-launcher /usr/bin/google-chrome
13+
RUN chmod +777 /usr/bin/google-chrome

google-chrome-launcher

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/bin/bash
2+
3+
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
4+
# Use of this source code is governed by a BSD-style license that can be
5+
# found in the LICENSE file.
6+
7+
# Let the wrapped binary know that it has been run through the wrapper.
8+
export CHROME_WRAPPER="`readlink -f "$0"`"
9+
10+
HERE="`dirname "$CHROME_WRAPPER"`"
11+
12+
# We include some xdg utilities next to the binary, and we want to prefer them
13+
# over the system versions when we know the system versions are very old. We
14+
# detect whether the system xdg utilities are sufficiently new to be likely to
15+
# work for us by looking for xdg-settings. If we find it, we leave $PATH alone,
16+
# so that the system xdg utilities (including any distro patches) will be used.
17+
if ! which xdg-settings &> /dev/null; then
18+
# Old xdg utilities. Prepend $HERE to $PATH to use ours instead.
19+
export PATH="$HERE:$PATH"
20+
else
21+
# Use system xdg utilities. But first create mimeapps.list if it doesn't
22+
# exist; some systems have bugs in xdg-mime that make it fail without it.
23+
xdg_app_dir="${XDG_DATA_HOME:-$HOME/.local/share/applications}"
24+
mkdir -p "$xdg_app_dir"
25+
[ -f "$xdg_app_dir/mimeapps.list" ] || touch "$xdg_app_dir/mimeapps.list"
26+
fi
27+
28+
# Always use our versions of ffmpeg libs.
29+
# This also makes RPMs find the compatibly-named library symlinks.
30+
if [[ -n "$LD_LIBRARY_PATH" ]]; then
31+
LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH"
32+
else
33+
LD_LIBRARY_PATH="$HERE:$HERE/lib"
34+
fi
35+
export LD_LIBRARY_PATH
36+
37+
export CHROME_VERSION_EXTRA="stable"
38+
39+
# We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
40+
export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
41+
42+
exec -a "$0" /opt/google/chrome/chrome --user-data-dir --no-sandbox --disable-gpu --headless "$@"

0 commit comments

Comments
 (0)