From 6b1989ec4c829700051573009a8d4fa868da0b32 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Sat, 9 Nov 2024 14:18:06 +1100 Subject: [PATCH] Revert "Instead of backport libraries, just upgrade to alpine 3.20 (python 1.12)" and the later attempts to make it work --- api_ping/Dockerfile | 4 ++-- backfiller/Dockerfile | 4 ++-- bus_analyzer/Dockerfile | 4 ++-- buscribe_api/Dockerfile | 4 ++-- chat_archiver/Dockerfile | 4 ++-- chat_archiver/setup.py | 1 + cutter/Dockerfile | 4 ++-- downloader/Dockerfile | 4 ++-- playlist_manager/Dockerfile | 4 ++-- restreamer/Dockerfile | 4 ++-- segment_coverage/Dockerfile | 4 ++-- sheetsync/Dockerfile | 4 ++-- sheetsync/setup.py | 1 + thrimshim/Dockerfile | 4 ++-- zulip_bots/Dockerfile | 4 ++-- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/api_ping/Dockerfile b/api_ping/Dockerfile index 5558d3c..bb5440d 100644 --- a/api_ping/Dockerfile +++ b/api_ping/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/backfiller/Dockerfile b/backfiller/Dockerfile index 3e83c7c..6648275 100644 --- a/backfiller/Dockerfile +++ b/backfiller/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/bus_analyzer/Dockerfile b/bus_analyzer/Dockerfile index e1a8bbd..63c412b 100644 --- a/bus_analyzer/Dockerfile +++ b/bus_analyzer/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev zlib-dev jpeg-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev zlib-dev jpeg-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/buscribe_api/Dockerfile b/buscribe_api/Dockerfile index 02c21b6..7108e0c 100644 --- a/buscribe_api/Dockerfile +++ b/buscribe_api/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras # should speed up installing python modules RUN pip install --upgrade pip wheel diff --git a/chat_archiver/Dockerfile b/chat_archiver/Dockerfile index c3f5b99..fa4e4cf 100644 --- a/chat_archiver/Dockerfile +++ b/chat_archiver/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/chat_archiver/setup.py b/chat_archiver/setup.py index d90f3c1..e51f3f3 100644 --- a/chat_archiver/setup.py +++ b/chat_archiver/setup.py @@ -9,6 +9,7 @@ setup( packages=find_packages(), install_requires=[ 'argh==0.28.1', + "exceptiongroup", # backport from python 3.11 'gevent', 'monotonic', 'requests', # for emote fetching diff --git a/cutter/Dockerfile b/cutter/Dockerfile index a13d8b5..b797eb3 100644 --- a/cutter/Dockerfile +++ b/cutter/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras zlib-dev jpeg-dev && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras zlib-dev jpeg-dev # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/downloader/Dockerfile b/downloader/Dockerfile index 4f69d1e..96c1aac 100644 --- a/downloader/Dockerfile +++ b/downloader/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/playlist_manager/Dockerfile b/playlist_manager/Dockerfile index 2509df3..47a32e2 100644 --- a/playlist_manager/Dockerfile +++ b/playlist_manager/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/restreamer/Dockerfile b/restreamer/Dockerfile index c58fdf8..44dd0e3 100644 --- a/restreamer/Dockerfile +++ b/restreamer/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras zlib-dev jpeg-dev && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras zlib-dev jpeg-dev # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/segment_coverage/Dockerfile b/segment_coverage/Dockerfile index 2e0c0d7..a5a697a 100644 --- a/segment_coverage/Dockerfile +++ b/segment_coverage/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras jpeg-dev zlib-dev && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras jpeg-dev zlib-dev # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/sheetsync/Dockerfile b/sheetsync/Dockerfile index 73e1559..231e47f 100644 --- a/sheetsync/Dockerfile +++ b/sheetsync/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/sheetsync/setup.py b/sheetsync/setup.py index 1528d6d..1974684 100644 --- a/sheetsync/setup.py +++ b/sheetsync/setup.py @@ -7,6 +7,7 @@ setup( install_requires = [ "argh==0.28.1", "gevent", + "exceptiongroup", # backport from python 3.11 "prometheus-client==0.7.1", # locked version as we rely on internals "psycogreen", "psycopg2", diff --git a/thrimshim/Dockerfile b/thrimshim/Dockerfile index cb27e97..02e7c0a 100644 --- a/thrimshim/Dockerfile +++ b/thrimshim/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev postgresql-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel diff --git a/zulip_bots/Dockerfile b/zulip_bots/Dockerfile index a8f83e6..ae142fc 100644 --- a/zulip_bots/Dockerfile +++ b/zulip_bots/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.20 +FROM alpine:3.14 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras && rm /usr/lib/python3.12/EXTERNALLY-MANAGED +RUN apk --update add py3-pip g++ python3-dev libffi-dev musl-dev file make busybox-extras # Try to get wheels working RUN pip install --upgrade pip wheel