From 56c7e846d47471e769998109684d2ae1c16db017 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 10 Jul 2023 17:30:45 +0100 Subject: [PATCH] Rebase to 3.18 --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 12 ++++++------ README.md | 1 + readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/init-apprise-config/type | 2 +- .../s6-overlay/s6-rc.d/svc-apprise/notification-fd | 2 +- root/etc/s6-overlay/s6-rc.d/svc-apprise/run | 2 +- root/etc/s6-overlay/s6-rc.d/svc-apprise/type | 2 +- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3e4ae4..26bb32b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label ARG BUILD_DATE @@ -37,11 +37,11 @@ RUN \ /app/apprise-api/ --strip-components=1 && \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ - python3 -m ensurepip --upgrade && \ - pip3 install -U --no-cache-dir \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2cdbc8e..afff6a0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # 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 BUILD_DATE @@ -37,17 +37,17 @@ RUN \ /app/apprise-api/ --strip-components=1 && \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ - python3 -m ensurepip --upgrade && \ - pip3 install -U --no-cache-dir \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \ + pip install -U --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 \ - /root/.cargo \ + $HOME/.cache \ + $HOME/.cargo \ /tmp/* # copy local files diff --git a/README.md b/README.md index 40ec5e1..0a5fa97 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.07.23:** - Rebase to Alpine 3.18. * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **11.02.23:** - Rebase to Alpine 3.17. * **17.10.22:** - Rebase to alpine 3.16, migrate to S6V3 diff --git a/readme-vars.yml b/readme-vars.yml index 787bd3e..ad1366a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -57,6 +57,7 @@ app_setup_block_enabled: false app_setup_block: [] # changelog changelogs: + - {date: "10.07.23:", desc: "Rebase to Alpine 3.18."} - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "11.02.23:", desc: "Rebase to Alpine 3.17."} - {date: "17.10.22:", desc: "Rebase to alpine 3.16, migrate to S6V3"} diff --git a/root/etc/s6-overlay/s6-rc.d/init-apprise-config/type b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/type index 3d92b15..bdd22a1 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-apprise-config/type +++ b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-apprise/notification-fd index e440e5c..00750ed 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-apprise/notification-fd +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/notification-fd @@ -1 +1 @@ -3 \ No newline at end of file +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/run b/root/etc/s6-overlay/s6-rc.d/svc-apprise/run index aeff78f..8d9d0eb 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-apprise/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/run @@ -3,4 +3,4 @@ exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8000" \ - cd /app/apprise-api/apprise_api s6-setuidgid abc /usr/sbin/uwsgi --http-socket=:8000 --enable-threads --plugin=python3 --module=core.wsgi:application --static-map=/s=static --buffer-size=32768 + cd /app/apprise-api/apprise_api s6-setuidgid abc /usr/sbin/uwsgi --http-socket=:8000 --enable-threads --plugin=python3 --module=core.wsgi:application --static-map=/s=static --buffer-size=32768 -H /lsiopy diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/type b/root/etc/s6-overlay/s6-rc.d/svc-apprise/type index 1780f9f..5883cff 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-apprise/type +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun