Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 56fa5fc

Browse files
committed
Upgrade to Python 3
1 parent 1b3a470 commit 56fa5fc

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Note image ids also change after scm-source.json has being updated which trigger
1111
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/a219926522070fb44317...master (TBD_DATE)
1212
+ Make proper use of haveged for random entropy
1313
+ Require `--privileged` else we get: `haveged: RNDADDENTROPY failed!`
14+
+ Upgrade to Python 3
1415
+ Add HEALTHCHECK docker instruction, closes #100
1516
+ Prefer -v /dev/shm:/dev/shm over --shm-size
1617
+ New --shm-size=2g suggested for Firefox credits @peterstory @cvakiitho https://goo.gl/5UzpDq

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For pull requests or local commits:
1212

1313
For repository owners only:
1414

15-
git commit -m "Upgrade Chrome patch to 58.0.3029.110"
15+
git commit -m "Upgrade to Python 3"
1616
git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
1717

1818
-- Wait for Travis to pass OK

Dockerfile

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,17 @@ USER root
263263
#=========================================================
264264
# Layer size: big.: 79.39 MB (with --no-install-recommends)
265265
# Layer size: huge: 296 MB
266-
RUN apt-get -qqy update \
267-
&& apt-get -qqy --no-install-recommends install \
268-
python2.7 \
269-
python-pip \
270-
python-openssl \
271-
libssl-dev \
272-
libffi-dev \
273-
&& pip install --upgrade pip \
274-
&& pip install --upgrade setuptools \
275-
&& rm -rf /var/lib/apt/lists/* \
276-
&& apt-get -qyy clean
266+
# RUN apt-get -qqy update \
267+
# && apt-get -qqy --no-install-recommends install \
268+
# python2.7 \
269+
# python-pip \
270+
# python-openssl \
271+
# libssl-dev \
272+
# libffi-dev \
273+
# && pip install --upgrade pip \
274+
# && pip install --upgrade setuptools \
275+
# && rm -rf /var/lib/apt/lists/* \
276+
# && apt-get -qyy clean
277277

278278
#=========================================================
279279
# Python3 for Supervisor, selenium tests, and other stuff
@@ -285,26 +285,26 @@ RUN apt-get -qqy update \
285285
# After install, make some useful symlinks that are expected to exist
286286
# Layer size: big.: 138.9 MB (with --no-install-recommends)
287287
# Layer size: huge: 309.9 MB
288-
# RUN apt-get -qqy update \
289-
# && apt-get -qqy --no-install-recommends install \
290-
# python3.5 \
291-
# python3-pip \
292-
# python3.5-dev \
293-
# python3-openssl \
294-
# libssl-dev libffi-dev \
295-
# && pip3 install --upgrade pip \
296-
# && pip3 install --upgrade setuptools \
297-
# && rm -rf /var/lib/apt/lists/* \
298-
# && apt-get -qyy clean
299-
# RUN cd /usr/local/bin \
300-
# && { [ -e easy_install ] || ln -s easy_install-* easy_install; } \
301-
# && ln -s idle3 idle \
302-
# && ln -s pydoc3 pydoc \
303-
# && ln -s python3 python \
304-
# && ln -s python3-config python-config \
305-
# && ln -s /usr/bin/python3 /usr/bin/python \
306-
# && python --version \
307-
# && pip --version
288+
RUN apt-get -qqy update \
289+
&& apt-get -qqy --no-install-recommends install \
290+
python3 \
291+
python3-pip \
292+
python3-dev \
293+
python3-openssl \
294+
libssl-dev libffi-dev \
295+
&& pip3 install --upgrade pip \
296+
&& pip3 install --upgrade setuptools \
297+
&& rm -rf /var/lib/apt/lists/* \
298+
&& apt-get -qyy clean
299+
RUN cd /usr/local/bin \
300+
&& { [ -e easy_install ] || ln -s easy_install-* easy_install; } \
301+
&& ln -s idle3 idle \
302+
&& ln -s pydoc3 pydoc \
303+
&& ln -s python3 python \
304+
&& ln -s python3-config python-config \
305+
&& ln -s /usr/bin/python3 /usr/bin/python \
306+
&& python --version \
307+
&& pip --version
308308

309309
#====================
310310
# Supervisor install

0 commit comments

Comments
 (0)