Skip to content

Commit c968dec

Browse files
committed
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
2 parents bdc1b82 + ba7e43e commit c968dec

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

docker/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# docker/run
1414

15-
FROM ubuntu:hirsute
15+
FROM python:3.6-bullseye
1616
LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
1717

1818
# Default django runserver port
@@ -24,7 +24,7 @@ EXPOSE 3306
2424
ENV DEBIAN_FRONTEND=noninteractive
2525
RUN apt-get -y update && \
2626
# apt-get upgrade is normally not a good idea, but this is a dev container
27-
apt-get upgrade && \
27+
apt-get -y upgrade && \
2828
# Install all dependencies that are available as packages
2929
apt-get -y install --no-install-recommends \
3030
apache2-utils \
@@ -45,8 +45,6 @@ RUN apt-get -y update && \
4545
pigz \
4646
pv \
4747
python-is-python3 \
48-
python3-dev \
49-
python3-pip \
5048
rsyslog \
5149
unzip \
5250
yang-tools && \
@@ -133,4 +131,4 @@ COPY docker-init.sh /docker-init.sh
133131
RUN chmod +x /docker-init.sh
134132

135133
WORKDIR /root/src
136-
ENTRYPOINT ["/docker-init.sh"]
134+
ENTRYPOINT ["/docker-init.sh"]

ietf/utils/jstest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ def start_web_driver():
3838
options.add_argument("disable-extensions")
3939
options.add_argument("disable-gpu") # headless needs this
4040
options.add_argument("no-sandbox") # docker needs this
41-
return webdriver.Chrome(service=service, options=options)
41+
# For selenium 3:
42+
return webdriver.Chrome("chromedriver", options=options)
43+
# For selenium 4:
44+
# return webdriver.Chrome(service=service, options=options)
4245

4346

4447
def selenium_enabled():

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ requests!=2.12.*
6262
requests-mock>=1.8
6363
rfc2html>=2.0.1
6464
scout-apm>=2.23.0
65-
selenium>=4.0.0
65+
selenium>=3.141.0,<4.0
6666
six>=1.10.0
6767
svn>=1.0.1
6868
tblib>=1.3.0

0 commit comments

Comments
 (0)