Skip to content

Commit b9d950b

Browse files
authored
Merge pull request #27 from linuxserver/main-3.24
Reabase to 3.24 (main)
2 parents 9bf3ea1 + 79dd61c commit b9d950b

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.23
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.24
44

55
# set version label
66
ARG BUILD_DATE
@@ -42,8 +42,8 @@ RUN \
4242
python3 -m venv /lsiopy && \
4343
pip install -U --no-cache-dir \
4444
pip \
45-
wheel && \
46-
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
45+
setuptools && \
46+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ -r requirements.txt && \
4747
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4848
echo "**** cleanup ****" && \
4949
apk del --purge \

Dockerfile.aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24
44

55
# set version label
66
ARG BUILD_DATE
@@ -42,8 +42,8 @@ RUN \
4242
python3 -m venv /lsiopy && \
4343
pip install -U --no-cache-dir \
4444
pip \
45-
wheel && \
46-
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
45+
setuptools && \
46+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ -r requirements.txt && \
4747
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4848
echo "**** cleanup ****" && \
4949
apk del --purge \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
299299

300300
## Versions
301301

302+
* **05.07.26:** - Rebase to Alpine 3.24.
302303
* **28.12.25:** - Rebase to Alpine 3.23.
303304
* **09.07.25:** - Rebase to Alpine 3.22.
304305
* **06.01.25:** - Rebase to Alpine 3.21.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ init_diagram: |
8888
"kometa:latest" <- Base Images
8989
# changelog
9090
changelogs:
91+
- {date: "05.07.26:", desc: "Rebase to Alpine 3.24."}
9192
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
9293
- {date: "09.07.25:", desc: "Rebase to Alpine 3.22."}
9394
- {date: "06.01.25:", desc: "Rebase to Alpine 3.21."}

0 commit comments

Comments
 (0)