From bc53a7541c1e73f37697f13adcab8afa3b728c43 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 21 Nov 2025 15:06:36 -0500 Subject: [PATCH 1/2] rebase to ubuntu jammy --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/FUNDING.yml | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 28 +++++++------ Dockerfile.aarch64 | 44 +++++++++++++-------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 15 files changed, 48 insertions(+), 30 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/FUNDING.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/permissions.yml diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 6c81fcd..4b0d097 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -11,22 +11,25 @@ ARG MYLAR3_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="aptalca" +ARG DEBIAN_FRONTEND="noninteractive" + RUN \ echo "**** install build dependencies ****" && \ - apk add --no-cache --virtual=build-dependencies \ - build-base \ - jpeg-dev \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ libffi-dev \ + libjpeg9-dev \ libwebp-dev \ python3-dev \ - zlib-dev && \ + zlib1g-dev && \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ - jpeg \ - libwebp-tools \ + apt-get install -y --no-install-recommends \ + libjpeg9 \ nodejs \ - python3 \ - zlib && \ + python3-venv \ + webp \ + zlib1g-dev && \ echo "**** install mylar3 ****" && \ if [ -z ${MYLAR3_RELEASE+x} ]; then \ MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/releases/latest \ @@ -43,7 +46,8 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ @@ -55,7 +59,7 @@ RUN \ COPY root/ / # add unrar -COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar +COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar # ports and volumes VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e4df223..6c02b0a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -11,22 +11,25 @@ ARG MYLAR3_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="aptalca" +ARG DEBIAN_FRONTEND="noninteractive" + RUN \ echo "**** install build dependencies ****" && \ - apk add --no-cache --virtual=build-dependencies \ - build-base \ - jpeg-dev \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ libffi-dev \ + libjpeg9-dev \ libwebp-dev \ python3-dev \ - zlib-dev && \ + zlib1g-dev && \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ - jpeg \ - libwebp-tools \ + apt-get install -y --no-install-recommends \ + libjpeg9 \ nodejs \ - python3 \ - zlib && \ + python3-venv \ + webp \ + zlib1g-dev && \ echo "**** install mylar3 ****" && \ if [ -z ${MYLAR3_RELEASE+x} ]; then \ MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/releases/latest \ @@ -43,19 +46,28 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ + apt-get -y purge \ + build-essential \ + libffi-dev \ + libjpeg9-dev \ + libwebp-dev \ + python3-dev \ + zlib1g-dev && \ + apt-get -y autoremove && \ rm -rf \ - /root/.cache \ - /tmp/* + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + $HOME/.cache # add local files COPY root/ / # add unrar -COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar +COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar # ports and volumes VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 5058557..a9b6169 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/mylar3' DEV_DOCKERHUB_IMAGE = 'lsiodev/mylar3' PR_DOCKERHUB_IMAGE = 'lspipepr/mylar3' - DIST_IMAGE = 'alpine' + DIST_IMAGE = 'ubuntu' MULTIARCH='true' CI='true' CI_WEB='true' diff --git a/README.md b/README.md index 04325e9..e82cafa 100644 --- a/README.md +++ b/README.md @@ -288,6 +288,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.11.25:** - Rebase to Ubuntu Jammy. * **23.12.23:** - Rebase to Alpine 3.19. * **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 0bb614e..ea2e284 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -17,7 +17,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/mylar3' - DEV_DOCKERHUB_IMAGE = 'lsiodev/mylar3' - PR_DOCKERHUB_IMAGE = 'lspipepr/mylar3' - - DIST_IMAGE = 'alpine' + - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - CI_WEB='true' diff --git a/readme-vars.yml b/readme-vars.yml index 4907df6..76274b8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -79,6 +79,7 @@ init_diagram: | "mylar3:latest" <- Base Images # changelog changelogs: + - {date: "21.11.25:", desc: "Rebase to Ubuntu Jammy."} - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} From a7a84422872622b374c28c038dbf94a4780dd9d7 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 21 Nov 2025 15:12:06 -0500 Subject: [PATCH 2/2] copy pasta fail --- Dockerfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b0d097..ee2e20f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,11 +49,19 @@ RUN \ pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ + apt-get -y purge \ + build-essential \ + libffi-dev \ + libjpeg9-dev \ + libwebp-dev \ + python3-dev \ + zlib1g-dev && \ + apt-get -y autoremove && \ rm -rf \ - /root/.cache \ - /tmp/* + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + $HOME/.cache # add local files COPY root/ /