Skip to content

Commit e019ffc

Browse files
authored
Merge pull request #54 from linuxserver/unstable-alpine
unstable: rebase to alpine 3.23
2 parents 449c885 + be0e5c2 commit e019ffc

6 files changed

Lines changed: 42 additions & 58 deletions

File tree

Dockerfile

Lines changed: 16 additions & 25 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
@@ -15,21 +15,20 @@ ARG DEBIAN_FRONTEND="noninteractive"
1515

1616
RUN \
1717
echo "**** install build dependencies ****" && \
18-
apt-get update && \
19-
apt-get install -y --no-install-recommends \
20-
build-essential \
18+
apk add --no-cache --virtual=build-dependencies \
19+
build-base \
20+
jpeg-dev \
2121
libffi-dev \
22-
libjpeg9-dev \
2322
libwebp-dev \
2423
python3-dev \
25-
zlib1g-dev && \
24+
zlib-dev && \
2625
echo "**** install runtime packages ****" && \
27-
apt-get install -y --no-install-recommends \
28-
libjpeg9 \
26+
apk add --no-cache \
27+
jpeg \
28+
libwebp-tools \
2929
nodejs \
30-
python3-venv \
31-
webp \
32-
zlib1g-dev && \
30+
python3 \
31+
zlib && \
3332
echo "**** install mylar3 ****" && \
3433
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3534
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \
@@ -46,28 +45,20 @@ RUN \
4645
pip install -U --no-cache-dir \
4746
pip \
4847
wheel && \
49-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
48+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
5049
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
5150
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 && \
51+
apk del --purge \
52+
build-dependencies && \
6053
rm -rf \
61-
/tmp/* \
62-
/var/lib/apt/lists/* \
63-
/var/tmp/* \
64-
$HOME/.cache
54+
$HOME/.cache \
55+
/tmp/*
6556

6657
# add local files
6758
COPY root/ /
6859

6960
# add unrar
70-
COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
61+
COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
7162

7263
# ports and volumes
7364
VOLUME /config

Dockerfile.aarch64

Lines changed: 16 additions & 25 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
@@ -15,21 +15,20 @@ ARG DEBIAN_FRONTEND="noninteractive"
1515

1616
RUN \
1717
echo "**** install build dependencies ****" && \
18-
apt-get update && \
19-
apt-get install -y --no-install-recommends \
20-
build-essential \
18+
apk add --no-cache --virtual=build-dependencies \
19+
build-base \
20+
jpeg-dev \
2121
libffi-dev \
22-
libjpeg9-dev \
2322
libwebp-dev \
2423
python3-dev \
25-
zlib1g-dev && \
24+
zlib-dev && \
2625
echo "**** install runtime packages ****" && \
27-
apt-get install -y --no-install-recommends \
28-
libjpeg9 \
26+
apk add --no-cache \
27+
jpeg \
28+
libwebp-tools \
2929
nodejs \
30-
python3-venv \
31-
webp \
32-
zlib1g-dev && \
30+
python3 \
31+
zlib && \
3332
echo "**** install mylar3 ****" && \
3433
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3534
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/1000papercuts \
@@ -46,28 +45,20 @@ RUN \
4645
pip install -U --no-cache-dir \
4746
pip \
4847
wheel && \
49-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
48+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \
5049
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
5150
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 && \
51+
apk del --purge \
52+
build-dependencies && \
6053
rm -rf \
61-
/tmp/* \
62-
/var/lib/apt/lists/* \
63-
/var/tmp/* \
64-
$HOME/.cache
54+
$HOME/.cache \
55+
/tmp/*
6556

6657
# add local files
6758
COPY root/ /
6859

6960
# add unrar
70-
COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
61+
COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
7162

7263
# ports and volumes
7364
VOLUME /config

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pipeline {
2929
DOCKERHUB_IMAGE = 'linuxserver/mylar3'
3030
DEV_DOCKERHUB_IMAGE = 'lsiodev/mylar3'
3131
PR_DOCKERHUB_IMAGE = 'lspipepr/mylar3'
32-
DIST_IMAGE = 'ubuntu'
32+
DIST_IMAGE = 'alpine'
3333
MULTIARCH='true'
3434
CI='true'
3535
CI_WEB='true'

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ This image provides various versions that are available via tags. Please read th
6060

6161
| Tag | Available | Description |
6262
| :----: | :----: |--- |
63-
| latest || Stable Mylar3 releases |
64-
| nightly || Commits to Mylar3 `python3-dev` branch |
65-
| unstable || Commits to Mylar3 `1000papercuts` branch |
63+
| latest || Commits to Mylar3 `python3-dev` branch |
64+
| nightly || Commits to Mylar3 `1000papercuts` branch (ubuntu) |
65+
| unstable || Commits to Mylar3 `1000papercuts` branch (alpine) |
6666

6767
## Application Setup
6868

@@ -289,4 +289,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
289289

290290
## Versions
291291

292+
* **19.02.26:** - Rebase `unstable` tag to alpine 3.23.
292293
* **05.02.26:** - Release `unstable` tag based on commits to upstream `1000papercuts` branch.

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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ available_architectures:
1313
# development version
1414
development_versions: true
1515
development_versions_items:
16-
- {tag: "latest", desc: "Stable Mylar3 releases"}
17-
- {tag: "nightly", desc: "Commits to Mylar3 `python3-dev` branch"}
18-
- {tag: "unstable", desc: "Commits to Mylar3 `1000papercuts` branch"}
16+
- {tag: "latest", desc: "Commits to Mylar3 `python3-dev` branch"}
17+
- {tag: "nightly", desc: "Commits to Mylar3 `1000papercuts` branch (ubuntu)"}
18+
- {tag: "unstable", desc: "Commits to Mylar3 `1000papercuts` branch (alpine)"}
1919
# container parameters
2020
param_container_name: "{{ project_name }}"
2121
param_usage_include_vols: true
@@ -79,4 +79,5 @@ init_diagram: |
7979
"mylar3:unstable" <- Base Images
8080
# changelog
8181
changelogs:
82+
- {date: "19.02.26:", desc: "Rebase `unstable` tag to alpine 3.23."}
8283
- {date: "05.02.26:", desc: "Release `unstable` tag based on commits to upstream `1000papercuts` branch."}

0 commit comments

Comments
 (0)