Skip to content

Commit

Permalink
Merge pull request #66 from seleniumbase/docker-fix
Browse files Browse the repository at this point in the history
Docker fix
  • Loading branch information
mdmintz authored Sep 21, 2016
2 parents 3b5280d + fb6e85c commit 84ae5ec
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ RUN CHROMEDRIVER_VERSION=`curl -sS chromedriver.storage.googleapis.com/LATEST_RE
#================
# Install Chrome
#================
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
&& echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list \
&& apt-get update \
&& apt-get install -y google-chrome-stable \
&& rm -rf /var/lib/apt/lists/*
RUN curl -sS -o - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list && \
apt-get -yqq update && \
apt-get -yqq install google-chrome-stable && \
rm -rf /var/lib/apt/lists/*

#==================
# Configure Chrome
#==================
RUN dpkg-divert --add --rename --divert /opt/google/chrome/google-chrome.real /opt/google/chrome/google-chrome && \
echo "#!/bin/bash\nexec /opt/google/chrome/google-chrome.real --disable-setuid-sandbox \"\$@\"" > /opt/google/chrome/google-chrome && \
echo "#!/bin/bash\nexec /opt/google/chrome/google-chrome.real --disable-setuid-sandbox --no-sandbox \"\$@\"" > /opt/google/chrome/google-chrome && \
chmod 755 /opt/google/chrome/google-chrome

#=================
Expand Down Expand Up @@ -96,7 +96,9 @@ RUN exec "$@"
#=====================
COPY seleniumbase /SeleniumBase/seleniumbase/
COPY examples /SeleniumBase/examples/
RUN cd /SeleniumBase && ls && pip install seleniumbase
COPY requirements.txt /SeleniumBase/requirements.txt
COPY setup.py /SeleniumBase/setup.py
RUN cd /SeleniumBase && ls && pip install -r requirements.txt

#==========================================
# Create entrypoint and grab example tests
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ setuptools>=26.0.0
selenium>=2.53.6
nose>=1.3.7
pytest>=3.0.1
six>=1.10.0
flake8==3.0.4
requests==2.11.1
urllib3==1.16
Expand Down
1 change: 1 addition & 0 deletions server_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ setuptools>=26.0.0
selenium>=2.53.6
nose>=1.3.7
pytest>=3.0.1
six>=1.10.0
flake8==3.0.4
requests==2.11.1
urllib3==1.16
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='seleniumbase',
version='1.2.8',
version='1.2.9',
url='http://seleniumbase.com',
author='Michael Mintz',
author_email='@mintzworld',
Expand All @@ -19,6 +19,7 @@
'selenium>=2.53.6',
'nose>=1.3.7',
'pytest>=3.0.1',
'six>=1.10.0',
'flake8==3.0.4',
'requests==2.11.1',
'urllib3==1.16',
Expand Down

0 comments on commit 84ae5ec

Please sign in to comment.