Skip to content

Commit

Permalink
Merge pull request #74 from komcrad/driver-updates
Browse files Browse the repository at this point in the history
Driver updates
  • Loading branch information
komcrad committed Jun 10, 2019
2 parents ec489fd + 90664db commit 432b67c
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: attackhelicopter/webdriver:0.9.0
- image: attackhelicopter/webdriver:0.10.0

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand Down
30 changes: 16 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,23 @@ RUN PHANTOMJS_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac

# install chrome

RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& (sudo dpkg -i /tmp/google-chrome-stable_current_amd64.deb || sudo apt-get -fy install) \
&& rm -rf /tmp/google-chrome-stable_current_amd64.deb \
&& sudo sed -i 's|HERE/chrome"|HERE/chrome" --disable-setuid-sandbox --no-sandbox|g' \
"/opt/google/chrome/google-chrome" \
&& google-chrome --version
#RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
# && (sudo dpkg -i /tmp/google-chrome-stable_current_amd64.deb || sudo apt-get -fy install) \
# && rm -rf /tmp/google-chrome-stable_current_amd64.deb \
# && sudo sed -i 's|HERE/chrome"|HERE/chrome" --disable-setuid-sandbox --no-sandbox|g' \
# "/opt/google/chrome/google-chrome" \
# && google-chrome --version

RUN export CHROMEDRIVER_RELEASE=$(curl --location --fail --retry 3 http://chromedriver.storage.googleapis.com/LATEST_RELEASE) \
&& curl --silent --show-error --location --fail --retry 3 --output /tmp/chromedriver_linux64.zip "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_RELEASE/chromedriver_linux64.zip" \
&& cd /tmp \
&& unzip chromedriver_linux64.zip \
&& rm -rf chromedriver_linux64.zip \
&& sudo mv chromedriver /usr/local/bin/chromedriver \
&& sudo chmod +x /usr/local/bin/chromedriver \
&& chromedriver --version
#RUN export CHROMEDRIVER_RELEASE=$(curl --location --fail --retry 3 http://chromedriver.storage.googleapis.com/LATEST_RELEASE) \
# && curl --silent --show-error --location --fail --retry 3 --output /tmp/chromedriver_linux64.zip "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_RELEASE/chromedriver_linux64.zip" \
# && cd /tmp \
# && unzip chromedriver_linux64.zip \
# && rm -rf chromedriver_linux64.zip \
# && sudo mv chromedriver /usr/local/bin/chromedriver \
# && sudo chmod +x /usr/local/bin/chromedriver \
# && chromedriver --version

RUN sudo apt-get install chromium

# install libgconf-2-4 manually since chrome no longer pulls it in automatically
RUN sudo apt-get install -y libgconf-2-4
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ core.clj contains functions to handle common browser tasks. You can either read
docker build --no-cache -t attackhelicopter/webdriver:0.9.0 -t attackhelicopter/webdriver:latest .
```
## Tested versions of firefox and chrome
-webdriver 0.13.0
- Firefox 67.0.1
- Chromium 75.0.3770.80
- webdriver 0.12.0
- Firefox 66.0.1
- Google Chrome 74.0.3729.108
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject webdriver "0.12.0"
(defproject webdriver "0.13.0"
:description "A clojure selenium webdriver wrapper"
:url "https://github.com/komcrad/webdriver"
:license {:name "LGPL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion src/webdriver/driver_manager.clj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
LoggingPreferences LogType)
(java.util.logging Level Logger)))

(defonce latest-chrome-version "74.0.3729.6")
(defonce latest-chrome-version "75.0.3770.8")
(defonce latest-gecko-version "0.24.0")

(defn- mkdownload-dir [m]
Expand Down

0 comments on commit 432b67c

Please sign in to comment.