Skip to content

Commit fb38aaa

Browse files
committed
Stay with Jammy
1 parent ea135dc commit fb38aaa

4 files changed

Lines changed: 52 additions & 34 deletions

File tree

Dockerfile

Lines changed: 25 additions & 16 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-alpine:3.23
5+
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
66

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

1414
RUN \
1515
echo "**** install build dependencies ****" && \
16-
apk add --no-cache --virtual=build-dependencies \
17-
build-base \
18-
jpeg-dev \
16+
apt-get update && \
17+
apt-get install -y --no-install-recommends \
18+
build-essential \
1919
libffi-dev \
20+
libjpeg9-dev \
2021
libwebp-dev \
2122
python3-dev \
22-
zlib-dev && \
23+
zlib1g-dev && \
2324
echo "**** install runtime packages ****" && \
24-
apk add --no-cache \
25-
jpeg \
26-
libwebp-tools \
25+
apt-get install -y --no-install-recommends \
26+
libjpeg9 \
2727
nodejs \
28-
python3 \
29-
zlib && \
28+
python3-venv \
29+
webp \
30+
zlib1g-dev && \
3031
echo "**** install mylar3 ****" && \
3132
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3233
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/releases/latest \
@@ -43,20 +44,28 @@ RUN \
4344
pip install -U --no-cache-dir \
4445
pip \
4546
setuptools && \
46-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
47+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
4748
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4849
echo "**** cleanup ****" && \
49-
apk del --purge \
50-
build-dependencies && \
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 && \
5158
rm -rf \
52-
$HOME/.cache \
53-
/tmp/*
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/* \
62+
$HOME/.cache
5463

5564
# add local files
5665
COPY root/ /
5766

5867
# add unrar
59-
COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
68+
COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
6069

6170
# ports and volumes
6271
VOLUME /config

Dockerfile.aarch64

Lines changed: 25 additions & 16 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-alpine:arm64v8-3.23
5+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
66

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

1414
RUN \
1515
echo "**** install build dependencies ****" && \
16-
apk add --no-cache --virtual=build-dependencies \
17-
build-base \
18-
jpeg-dev \
16+
apt-get update && \
17+
apt-get install -y --no-install-recommends \
18+
build-essential \
1919
libffi-dev \
20+
libjpeg9-dev \
2021
libwebp-dev \
2122
python3-dev \
22-
zlib-dev && \
23+
zlib1g-dev && \
2324
echo "**** install runtime packages ****" && \
24-
apk add --no-cache \
25-
jpeg \
26-
libwebp-tools \
25+
apt-get install -y --no-install-recommends \
26+
libjpeg9 \
2727
nodejs \
28-
python3 \
29-
zlib && \
28+
python3-venv \
29+
webp \
30+
zlib1g-dev && \
3031
echo "**** install mylar3 ****" && \
3132
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3233
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/releases/latest \
@@ -43,20 +44,28 @@ RUN \
4344
pip install -U --no-cache-dir \
4445
pip \
4546
setuptools && \
46-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
47+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
4748
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4849
echo "**** cleanup ****" && \
49-
apk del --purge \
50-
build-dependencies && \
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 && \
5158
rm -rf \
52-
$HOME/.cache \
53-
/tmp/*
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/* \
62+
$HOME/.cache
5463

5564
# add local files
5665
COPY root/ /
5766

5867
# add unrar
59-
COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
68+
COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
6069

6170
# ports and volumes
6271
VOLUME /config

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 = 'alpine'
20+
- DIST_IMAGE = 'ubuntu'
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
@@ -79,7 +79,7 @@ init_diagram: |
7979
"mylar3:latest" <- Base Images
8080
# changelog
8181
changelogs:
82-
- {date: "06.04.26:", desc: "Switch upstream to maintained fork at https://github.com/MylarComics/mylar3. Drop `unstable` tag. Rebase to Alpine 3.23."}
82+
- {date: "06.04.26:", desc: "Switch upstream to maintained fork at https://github.com/MylarComics/mylar3. Drop `unstable` tag."}
8383
- {date: "19.02.26:", desc: "Rebase `latest` tag based on commits to upstream `python3-dev` branch. `nightly` will build commits to upstream `1000papercuts` branch. `unstable` tag will also build commits to upstream `1000papercuts` branch, but on alpine 3.23 with python 3.12."}
8484
- {date: "05.02.26:", desc: "Release `unstable` tag based on commits to upstream `1000papercuts` branch."}
8585
- {date: "21.11.25:", desc: "Rebase to Ubuntu Jammy."}

0 commit comments

Comments
 (0)