Skip to content

Commit 78f41e4

Browse files
committed
Update upstream to new fork, rebase to alpine 3.23
1 parent 038da7e commit 78f41e4

8 files changed

Lines changed: 145 additions & 172 deletions

File tree

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
github: linuxserver
22
open_collective: linuxserver
3-
custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EWQADB5AMVRFU",]

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
echo "> External trigger running off of nightly branch. To disable this trigger, add \`mylar3_nightly\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts" | jq -r '. | .sha' | cut -c1-8)
32+
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/MylarComics/mylar3/commits/nightly" | jq -r '. | .sha' | cut -c1-8)
3333
echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^mylar3_nightly_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 18 additions & 29 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
@@ -11,57 +11,46 @@ ARG MYLAR3_RELEASE
1111
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
1212
LABEL maintainer="aptalca"
1313

14-
ARG DEBIAN_FRONTEND="noninteractive"
15-
1614
RUN \
1715
echo "**** install build dependencies ****" && \
18-
apt-get update && \
19-
apt-get install -y --no-install-recommends \
20-
build-essential \
16+
apk add --no-cache --virtual=build-dependencies \
17+
build-base \
18+
jpeg-dev \
2119
libffi-dev \
22-
libjpeg9-dev \
2320
libwebp-dev \
2421
python3-dev \
25-
zlib1g-dev && \
22+
zlib-dev && \
2623
echo "**** install runtime packages ****" && \
27-
apt-get install -y --no-install-recommends \
28-
libjpeg9 \
24+
apk add --no-cache \
25+
jpeg \
26+
libwebp-tools \
2927
nodejs \
30-
python3-venv \
31-
webp \
32-
zlib1g-dev && \
28+
python3 \
29+
zlib && \
3330
echo "**** install mylar3 ****" && \
3431
if [ -z ${MYLAR3_RELEASE+x} ]; then \
35-
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \
32+
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/commits/nightly \
3633
| jq -r '.sha' | cut -c1-8); \
3734
fi && \
3835
mkdir /app/mylar3 && \
3936
curl -o \
4037
/tmp/mylar3.tar.gz -L \
41-
"https://github.com/mylar3/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
38+
"https://github.com/MylarComics/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
4239
tar xf /tmp/mylar3.tar.gz -C \
4340
/app/mylar3/ --strip-components=1 && \
4441
cd /app/mylar3 && \
4542
python3 -m venv /lsiopy && \
4643
pip install -U --no-cache-dir \
4744
pip \
48-
wheel && \
49-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
45+
setuptools && \
46+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
5047
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
5148
echo "**** cleanup ****" && \
52-
apt-get -y purge \
53-
build-essential \
54-
libffi-dev \
55-
libjpeg9-dev \
56-
libwebp-dev \
57-
python3-dev \
58-
zlib1g-dev && \
59-
apt-get -y autoremove && \
49+
apk del --purge \
50+
build-dependencies && \
6051
rm -rf \
61-
/tmp/* \
62-
/var/lib/apt/lists/* \
63-
/var/tmp/* \
64-
$HOME/.cache
52+
$HOME/.cache \
53+
/tmp/*
6554

6655
# add local files
6756
COPY root/ /

Dockerfile.aarch64

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

3-
FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
3+
FROM ghcr.io/linuxserver/unrar: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
@@ -11,57 +11,46 @@ ARG MYLAR3_RELEASE
1111
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
1212
LABEL maintainer="aptalca"
1313

14-
ARG DEBIAN_FRONTEND="noninteractive"
15-
1614
RUN \
1715
echo "**** install build dependencies ****" && \
18-
apt-get update && \
19-
apt-get install -y --no-install-recommends \
20-
build-essential \
16+
apk add --no-cache --virtual=build-dependencies \
17+
build-base \
18+
jpeg-dev \
2119
libffi-dev \
22-
libjpeg9-dev \
2320
libwebp-dev \
2421
python3-dev \
25-
zlib1g-dev && \
22+
zlib-dev && \
2623
echo "**** install runtime packages ****" && \
27-
apt-get install -y --no-install-recommends \
28-
libjpeg9 \
24+
apk add --no-cache \
25+
jpeg \
26+
libwebp-tools \
2927
nodejs \
30-
python3-venv \
31-
webp \
32-
zlib1g-dev && \
28+
python3 \
29+
zlib && \
3330
echo "**** install mylar3 ****" && \
3431
if [ -z ${MYLAR3_RELEASE+x} ]; then \
35-
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \
32+
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/commits/nightly \
3633
| jq -r '.sha' | cut -c1-8); \
3734
fi && \
3835
mkdir /app/mylar3 && \
3936
curl -o \
4037
/tmp/mylar3.tar.gz -L \
41-
"https://github.com/mylar3/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
38+
"https://github.com/MylarComics/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
4239
tar xf /tmp/mylar3.tar.gz -C \
4340
/app/mylar3/ --strip-components=1 && \
4441
cd /app/mylar3 && \
4542
python3 -m venv /lsiopy && \
4643
pip install -U --no-cache-dir \
4744
pip \
48-
wheel && \
49-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
45+
setuptools && \
46+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
5047
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
5148
echo "**** cleanup ****" && \
52-
apt-get -y purge \
53-
build-essential \
54-
libffi-dev \
55-
libjpeg9-dev \
56-
libwebp-dev \
57-
python3-dev \
58-
zlib1g-dev && \
59-
apt-get -y autoremove && \
49+
apk del --purge \
50+
build-dependencies && \
6051
rm -rf \
61-
/tmp/* \
62-
/var/lib/apt/lists/* \
63-
/var/tmp/* \
64-
$HOME/.cache
52+
$HOME/.cache \
53+
/tmp/*
6554

6655
# add local files
6756
COPY root/ /

0 commit comments

Comments
 (0)