From 10f019e795402292785e347c9826e07290037f91 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Tue, 25 Jun 2024 18:49:11 -0700 Subject: [PATCH] Switch back to python2 to fix issues (#67) It seems as though this app isn't quite python3 compatible yet. This does the following: - Switch to using an AlmaLinux 8 so we can use python2 - Install git which is needed for the app to run - Update requirements.txt to match current production We need to eventually get this app and it's dependencies upgraded but this at least allows us to migrate it. Signed-off-by: Lance Albertson --- Dockerfile | 5 +++-- requirements.txt | 42 ++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9edd019..6d33c17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM python:3.11-alpine +FROM almalinux:8 +RUN dnf -y install python2-pip python2-devel git COPY requirements.txt /prerelease_website/requirements.txt WORKDIR /prerelease_website -RUN pip --no-cache-dir install -r requirements.txt +RUN pip2 --no-cache-dir install -r requirements.txt COPY . /prerelease_website ENTRYPOINT ["/prerelease_website/entrypoint.sh"] EXPOSE 5000 diff --git a/requirements.txt b/requirements.txt index e511d5a..a6a45cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,21 @@ -blinker==1.8.2 -catkin-pkg==1.0.0 -click==8.1.7 -configparser==7.0.0 -distro==1.9.0 -docutils==0.21.2 -empy==4.1 -Flask==3.0.3 -gunicorn==22.0.0 -itsdangerous==2.2.0 -Jinja2==3.1.4 -MarkupSafe==2.1.5 -packaging==24.1 -pyparsing==3.1.2 -python-dateutil==2.9.0.post0 -PyYAML==6.0.1 +catkin-pkg==0.4.23 +click==7.1.2 +configparser==4.0.2 +distro==1.5.0 +docutils==0.16 +empy==3.3.4 +Flask==1.1.2 +gunicorn==19.10.0 +itsdangerous==1.1.0 +Jinja2==2.11.3 +MarkupSafe==1.1.1 +pyparsing==2.4.7 +python-dateutil==2.8.1 +PyYAML==5.4.1 ros-buildfarm==3.0.0 -rosdistro==0.9.1 -rosinstall-generator==0.1.23 -rospkg==1.5.1 -six==1.16.0 -vcstool==0.3.0 -Werkzeug==3.0.3 +rosdistro==0.8.3 +rosinstall-generator==0.1.22 +rospkg==1.2.10 +six==1.15.0 +vcstool==0.2.15 +Werkzeug==1.0.1