From 8b44088df5541dc989b2d8b1eeebe15564ab7a1f Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Thu, 9 Jan 2025 21:13:55 +0100 Subject: [PATCH 1/4] update linuxserver test build --- .github/test/Dockerfile-alpine | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/test/Dockerfile-alpine b/.github/test/Dockerfile-alpine index aab923b22b4..624184e70d2 100644 --- a/.github/test/Dockerfile-alpine +++ b/.github/test/Dockerfile-alpine @@ -2,32 +2,33 @@ # Test that we can still build on Alpine (musl modified libc https://musl.libc.org/) # Some packages wont install via pypi because they dont have a wheel available under this architecture. -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:3.21 ENV PYTHONUNBUFFERED=1 COPY requirements.txt /requirements.txt RUN \ - apk add --update --no-cache --virtual=build-dependencies \ + apk add --update --no-cache --virtual=build-dependencies \ + build-base \ cargo \ - g++ \ - gcc \ + git \ jpeg-dev \ libc-dev \ libffi-dev \ - libjpeg \ libxslt-dev \ - make \ openssl-dev \ - py3-wheel \ python3-dev \ + zip \ zlib-dev && \ apk add --update --no-cache \ + libjpeg \ libxslt \ - python3 \ + nodejs \ + poppler-utils \ + python3 && \ py3-pip && \ echo "**** pip3 install test of changedetection.io ****" && \ pip3 install -U pip wheel setuptools && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r /requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r /requirements.txt && \ apk del --purge \ build-dependencies From e3b03ba55d53b84ab5e591967960fd5f0c4fd84c Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Thu, 9 Jan 2025 21:17:46 +0100 Subject: [PATCH 2/4] py3-pip no longer around --- .github/test/Dockerfile-alpine | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/test/Dockerfile-alpine b/.github/test/Dockerfile-alpine index 624184e70d2..4247c165d19 100644 --- a/.github/test/Dockerfile-alpine +++ b/.github/test/Dockerfile-alpine @@ -26,7 +26,6 @@ RUN \ nodejs \ poppler-utils \ python3 && \ - py3-pip && \ echo "**** pip3 install test of changedetection.io ****" && \ pip3 install -U pip wheel setuptools && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r /requirements.txt && \ From 18fc53b4f8ad0c40eb546f9512e4a48909883932 Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Thu, 9 Jan 2025 21:20:23 +0100 Subject: [PATCH 3/4] bump --- .github/test/Dockerfile-alpine | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/test/Dockerfile-alpine b/.github/test/Dockerfile-alpine index 4247c165d19..2c0d6ff6c97 100644 --- a/.github/test/Dockerfile-alpine +++ b/.github/test/Dockerfile-alpine @@ -27,7 +27,7 @@ RUN \ poppler-utils \ python3 && \ echo "**** pip3 install test of changedetection.io ****" && \ - pip3 install -U pip wheel setuptools && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r /requirements.txt && \ + pip install -U pip wheel setuptools && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r /requirements.txt && \ apk del --purge \ build-dependencies From a3e0ade7d9f47ebdf07f513c0bcb9bdd07842415 Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Thu, 9 Jan 2025 21:23:41 +0100 Subject: [PATCH 4/4] add pyenv --- .github/test/Dockerfile-alpine | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/test/Dockerfile-alpine b/.github/test/Dockerfile-alpine index 2c0d6ff6c97..132391671f5 100644 --- a/.github/test/Dockerfile-alpine +++ b/.github/test/Dockerfile-alpine @@ -27,6 +27,7 @@ RUN \ poppler-utils \ python3 && \ echo "**** pip3 install test of changedetection.io ****" && \ + python3 -m venv /lsiopy && \ pip install -U pip wheel setuptools && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r /requirements.txt && \ apk del --purge \