Merged in ^/personal/nick/7.39.1.dev1@19547 from nick@staff.ietf.org:
Downgrade to Python 3.6 to match production. Downgrade to selenium 3.141.0 as a consequence. - Legacy-Id: 19557
This commit is contained in:
commit
c968deca01
|
@ -12,7 +12,7 @@
|
|||
#
|
||||
# docker/run
|
||||
|
||||
FROM ubuntu:hirsute
|
||||
FROM python:3.6-bullseye
|
||||
LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
|
||||
|
||||
# Default django runserver port
|
||||
|
@ -24,7 +24,7 @@ EXPOSE 3306
|
|||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get -y update && \
|
||||
# apt-get upgrade is normally not a good idea, but this is a dev container
|
||||
apt-get upgrade && \
|
||||
apt-get -y upgrade && \
|
||||
# Install all dependencies that are available as packages
|
||||
apt-get -y install --no-install-recommends \
|
||||
apache2-utils \
|
||||
|
@ -45,8 +45,6 @@ RUN apt-get -y update && \
|
|||
pigz \
|
||||
pv \
|
||||
python-is-python3 \
|
||||
python3-dev \
|
||||
python3-pip \
|
||||
rsyslog \
|
||||
unzip \
|
||||
yang-tools && \
|
||||
|
|
|
@ -38,7 +38,10 @@ def start_web_driver():
|
|||
options.add_argument("disable-extensions")
|
||||
options.add_argument("disable-gpu") # headless needs this
|
||||
options.add_argument("no-sandbox") # docker needs this
|
||||
return webdriver.Chrome(service=service, options=options)
|
||||
# For selenium 3:
|
||||
return webdriver.Chrome("chromedriver", options=options)
|
||||
# For selenium 4:
|
||||
# return webdriver.Chrome(service=service, options=options)
|
||||
|
||||
|
||||
def selenium_enabled():
|
||||
|
|
|
@ -62,7 +62,7 @@ requests!=2.12.*
|
|||
requests-mock>=1.8
|
||||
rfc2html>=2.0.1
|
||||
scout-apm>=2.23.0
|
||||
selenium>=4.0.0
|
||||
selenium>=3.141.0,<4.0
|
||||
six>=1.10.0
|
||||
svn>=1.0.1
|
||||
tblib>=1.3.0
|
||||
|
|
Loading…
Reference in a new issue