Skip to content
This repository has been archived by the owner on Jul 7, 2023. It is now read-only.

Commit

Permalink
New Chrome version
Browse files Browse the repository at this point in the history
Ensure keystore is created before chrome starts
  • Loading branch information
johnerikhalse committed Nov 24, 2017
1 parent 3b17b22 commit ae463ac
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ RUN apt-get update -qqy \
&& apt-get -qqy install libnss3 libnss3-tools libfontconfig1 wget ca-certificates apt-transport-https inotify-tools \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*

ENV CHROME_VERSION=58.0.3029.19
# Find the latest unstable version here: https://www.ubuntuupdates.org/ppa/google_chrome. Remove last '-1' to get Chrome version
ENV CHROME_VERSION=64.0.3269.3

RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
Expand Down
3 changes: 0 additions & 3 deletions import_cert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ function add_cert {
fi
}

certutil -d sql:$NSSDB --empty-password -N -f /dev/null 2> /dev/null
echo "Keystore created"

for pem in `ls $CERTS/*.pem 2> /dev/null`; do
add_cert $pem
done
Expand Down
9 changes: 8 additions & 1 deletion start.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
#!/bin/bash

# Create NSSDB
certutil -d sql:$NSSDB --empty-password -N -f /dev/null 2> /dev/null
echo "Keystore created"

# Run the NSSDB updating utility in background
import_cert.sh $HOME &

CHROME_ARGS="--disable-gpu --headless --no-sandbox --remote-debugging-address=$DEBUG_ADDRESS --remote-debugging-port=$DEBUG_PORT --user-data-dir=/data"
sleep 2

CHROME_ARGS="--disable-gpu --headless --no-sandbox --dbus-stub --remote-debugging-address=$DEBUG_ADDRESS --remote-debugging-port=$DEBUG_PORT --user-data-dir=/data"

# Add extra options to Chrome from environment variable CHROME_OPTS
if [ -n "$CHROME_OPTS" ]; then
CHROME_ARGS="${CHROME_ARGS} ${CHROME_OPTS}"
fi
Expand Down

0 comments on commit ae463ac

Please sign in to comment.