From e1c7ed4c2c57efed96fde7e312fbfa7e7207772f Mon Sep 17 00:00:00 2001
From: nick <nick@staff.ietf.org>
Date: Wed, 3 Nov 2021 21:52:14 +0000
Subject: [PATCH 1/2] fix: downgrade docker/Dockerfile to Python 3.6 and
selenium 3.141.0 - Legacy-Id: 19546
---
docker/Dockerfile | 8 +++-----
requirements.txt | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4def042a5..cfeb033ae 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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 && \
@@ -133,4 +131,4 @@ COPY docker-init.sh /docker-init.sh
RUN chmod +x /docker-init.sh
WORKDIR /root/src
-ENTRYPOINT ["/docker-init.sh"]
\ No newline at end of file
+ENTRYPOINT ["/docker-init.sh"]
diff --git a/requirements.txt b/requirements.txt
index 1e634d153..b829dbfb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
From ba7e43ec315fdcab9d0289fee29267ac59e7060d Mon Sep 17 00:00:00 2001
From: nick <nick@staff.ietf.org>
Date: Thu, 4 Nov 2021 00:46:17 +0000
Subject: [PATCH 2/2] fix: selenium 3.x webdriver start parameter - Legacy-Id:
19547
---
ietf/utils/jstest.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py
index de157f161..f7671f270 100644
--- a/ietf/utils/jstest.py
+++ b/ietf/utils/jstest.py
@@ -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():