From 0f7497648f06114766991cdab489ad6b0beb5143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikolai=20R=C3=B8ed=20Kristiansen?= Date: Mon, 6 Oct 2025 21:22:42 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20unused=20workaround?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python 3.7 and 3.8 are EOL since a while ago --- templates/alpine.Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/templates/alpine.Dockerfile b/templates/alpine.Dockerfile index fc92ec9..fbf42f0 100644 --- a/templates/alpine.Dockerfile +++ b/templates/alpine.Dockerfile @@ -6,12 +6,6 @@ FROM python:{{ python_image }} AS builder # Install node prereqs, nodejs and yarn # Ref: https://raw.githubusercontent.com/nodejs/docker-node/master/Dockerfile-alpine.template # Ref: https://yarnpkg.com/en/docs/install -{% if python == "3.7" or python == "3.8" %} -# poetry: Workaround for missing cffi musllinux wheels on olds pythons. Ref: https://foss.heptapod.net/pypy/cffi/-/issues/509 -RUN apk add gcc musl-dev libffi-dev -RUN pip install cffi -RUN find /root/.cache/pip/wheels -name '*.whl' -exec cp {} / + -{% endif %} RUN apk add curl # FIXME: no arm + musl build yet # Ref: https://github.com/nodejs/unofficial-builds/pull/59 @@ -34,9 +28,4 @@ RUN pip install -U pip pipenv uv # Mimic what https://install.python-poetry.org does without the flexibility (platforms, install sources, etc). ENV VENV=/opt/poetryvenv RUN python -m venv $VENV && $VENV/bin/pip install -U pip wheel -{% if python == "3.7" or python == "3.8" %} -# Workaround for missing cffi musllinux wheels on older pythons -COPY --from=builder /*.whl / -RUN $VENV/bin/pip install /*.whl && rm /*.whl -{% endif %} RUN $VENV/bin/pip install poetry && ln -s $VENV/bin/poetry /usr/local/bin/poetry