diff --git a/Dockerfile b/Dockerfile index 6a94602..e51a4eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label -ARG UNRAR_VERSION=6.1.7 +ARG UNRAR_VERSION=6.2.8 ARG BUILD_DATE ARG VERSION ARG MYLAR3_RELEASE @@ -49,16 +49,16 @@ RUN \ tar xf /tmp/mylar3.tar.gz -C \ /app/mylar3/ --strip-components=1 && \ cd /app/mylar3 && \ - python3 -m ensurepip --upgrade && \ - pip3 install -U --no-cache-dir \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ + $HOME/.cache \ /tmp/* # add local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 801fef5..172acca 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,9 +1,9 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label -ARG UNRAR_VERSION=6.1.7 +ARG UNRAR_VERSION=6.2.8 ARG BUILD_DATE ARG VERSION ARG MYLAR3_RELEASE @@ -49,16 +49,16 @@ RUN \ tar xf /tmp/mylar3.tar.gz -C \ /app/mylar3/ --strip-components=1 && \ cd /app/mylar3 && \ - python3 -m ensurepip --upgrade && \ - pip3 install -U --no-cache-dir \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ + $HOME/.cache \ /tmp/* # add local files diff --git a/README.md b/README.md index b7a3e08..6c33c07 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.07.23:** - Rebase to Alpine 3.18 * **07.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **05.03.23:** - Rebase nightly to Alpine 3.17. * **13.10.22:** - Move unrar to /usr/bin for backwards compatibility. diff --git a/readme-vars.yml b/readme-vars.yml index bc876b2..64469c7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,6 +33,7 @@ app_setup_block: | For more detailed setup options, refer to [{{ project_name|capitalize }}]({{ project_url }}). # changelog changelogs: + - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} - {date: "07.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "05.03.23:", desc: "Rebase nightly to Alpine 3.17."} - {date: "13.10.22:", desc: "Move unrar to /usr/bin for backwards compatibility."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/type b/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/type index 3d92b15..bdd22a1 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/type +++ b/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/up b/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/up index c71187c..6de15a2 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/up +++ b/root/etc/s6-overlay/s6-rc.d/init-mylar3-config/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/init-mylar3-config/run \ No newline at end of file +/etc/s6-overlay/s6-rc.d/init-mylar3-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mylar3/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-mylar3/notification-fd index e440e5c..00750ed 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-mylar3/notification-fd +++ b/root/etc/s6-overlay/s6-rc.d/svc-mylar3/notification-fd @@ -1 +1 @@ -3 \ No newline at end of file +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mylar3/type b/root/etc/s6-overlay/s6-rc.d/svc-mylar3/type index 1780f9f..5883cff 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-mylar3/type +++ b/root/etc/s6-overlay/s6-rc.d/svc-mylar3/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun