Skip to content

Commit 987cc17

Browse files
committed
Revert "Stay with Jammy"
This reverts commit 7b8d523.
1 parent e8577fb commit 987cc17

4 files changed

Lines changed: 32 additions & 50 deletions

File tree

Dockerfile

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM ghcr.io/linuxserver/unrar:latest AS unrar
44

5-
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
5+
FROM ghcr.io/linuxserver/baseimage-alpine:3.23
66

77
# set version label
88
ARG BUILD_DATE
@@ -13,21 +13,20 @@ LABEL maintainer="aptalca"
1313

1414
RUN \
1515
echo "**** install build dependencies ****" && \
16-
apt-get update && \
17-
apt-get install -y --no-install-recommends \
18-
build-essential \
16+
apk add --no-cache --virtual=build-dependencies \
17+
build-base \
18+
jpeg-dev \
1919
libffi-dev \
20-
libjpeg9-dev \
2120
libwebp-dev \
2221
python3-dev \
23-
zlib1g-dev && \
22+
zlib-dev && \
2423
echo "**** install runtime packages ****" && \
25-
apt-get install -y --no-install-recommends \
26-
libjpeg9 \
24+
apk add --no-cache \
25+
jpeg \
26+
libwebp-tools \
2727
nodejs \
28-
python3-venv \
29-
webp \
30-
zlib1g-dev && \
28+
python3 \
29+
zlib && \
3130
echo "**** install mylar3 ****" && \
3231
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3332
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/commits/nightly \
@@ -44,22 +43,14 @@ RUN \
4443
pip install -U --no-cache-dir \
4544
pip \
4645
setuptools && \
47-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
46+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
4847
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4948
echo "**** cleanup ****" && \
50-
apt-get -y purge \
51-
build-essential \
52-
libffi-dev \
53-
libjpeg9-dev \
54-
libwebp-dev \
55-
python3-dev \
56-
zlib1g-dev && \
57-
apt-get -y autoremove && \
49+
apk del --purge \
50+
build-dependencies && \
5851
rm -rf \
59-
/tmp/* \
60-
/var/lib/apt/lists/* \
61-
/var/tmp/* \
62-
$HOME/.cache
52+
$HOME/.cache \
53+
/tmp/*
6354

6455
# add local files
6556
COPY root/ /

Dockerfile.aarch64

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
44

5-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
5+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23
66

77
# set version label
88
ARG BUILD_DATE
@@ -13,21 +13,20 @@ LABEL maintainer="aptalca"
1313

1414
RUN \
1515
echo "**** install build dependencies ****" && \
16-
apt-get update && \
17-
apt-get install -y --no-install-recommends \
18-
build-essential \
16+
apk add --no-cache --virtual=build-dependencies \
17+
build-base \
18+
jpeg-dev \
1919
libffi-dev \
20-
libjpeg9-dev \
2120
libwebp-dev \
2221
python3-dev \
23-
zlib1g-dev && \
22+
zlib-dev && \
2423
echo "**** install runtime packages ****" && \
25-
apt-get install -y --no-install-recommends \
26-
libjpeg9 \
24+
apk add --no-cache \
25+
jpeg \
26+
libwebp-tools \
2727
nodejs \
28-
python3-venv \
29-
webp \
30-
zlib1g-dev && \
28+
python3 \
29+
zlib && \
3130
echo "**** install mylar3 ****" && \
3231
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3332
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/commits/nightly \
@@ -44,22 +43,14 @@ RUN \
4443
pip install -U --no-cache-dir \
4544
pip \
4645
setuptools && \
47-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
46+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
4847
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4948
echo "**** cleanup ****" && \
50-
apt-get -y purge \
51-
build-essential \
52-
libffi-dev \
53-
libjpeg9-dev \
54-
libwebp-dev \
55-
python3-dev \
56-
zlib1g-dev && \
57-
apt-get -y autoremove && \
49+
apk del --purge \
50+
build-dependencies && \
5851
rm -rf \
59-
/tmp/* \
60-
/var/lib/apt/lists/* \
61-
/var/tmp/* \
62-
$HOME/.cache
52+
$HOME/.cache \
53+
/tmp/*
6354

6455
# add local files
6556
COPY root/ /

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repo_vars:
1717
- DOCKERHUB_IMAGE = 'linuxserver/mylar3'
1818
- DEV_DOCKERHUB_IMAGE = 'lsiodev/mylar3'
1919
- PR_DOCKERHUB_IMAGE = 'lspipepr/mylar3'
20-
- DIST_IMAGE = 'ubuntu'
20+
- DIST_IMAGE = 'alpine'
2121
- MULTIARCH='true'
2222
- CI='true'
2323
- CI_WEB='true'

readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ init_diagram: |
7878
"mylar3:nightly" <- Base Images
7979
# changelog
8080
changelogs:
81-
- {date: "06.04.26:", desc: "Switch upstream to maintained fork at https://github.com/MylarComics/mylar3. Drop `unstable` tag."}
81+
- {date: "06.04.26:", desc: "Switch upstream to maintained fork at https://github.com/MylarComics/mylar3. Drop `unstable` tag. Rebase to Alpine 3.23."}
8282
- {date: "19.02.26:", desc: "Rebase `nightly` tag to build commits from upstream `1000papercuts` branch."}
8383
- {date: "05.02.26:", desc: "Release `unstable` tag based on commits to upstream `1000papercuts` branch."}
8484
- {date: "10.11.25:", desc: "Rebase to Ubuntu Jammy."}

0 commit comments

Comments
 (0)