diff --git a/Dockerfile b/Dockerfile index 225d791..6513475 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -40,7 +40,7 @@ RUN \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ pip3 install -U --no-cache-dir pip wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ @@ -51,3 +51,4 @@ RUN \ # copy local files COPY root/ / +EXPOSE 8000 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5c37fcd..c06ad26 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 # set version label ARG BUILD_DATE @@ -40,7 +40,7 @@ RUN \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ pip3 install -U --no-cache-dir pip wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ @@ -51,3 +51,4 @@ RUN \ # copy local files COPY root/ / +EXPOSE 8000 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c98ebb7..fd74cc9 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 # set version label ARG BUILD_DATE @@ -40,7 +40,7 @@ RUN \ echo "**** install pip packages ****" && \ cd /app/apprise-api && \ pip3 install -U --no-cache-dir pip wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ @@ -51,3 +51,4 @@ RUN \ # copy local files COPY root/ / +EXPOSE 8000 diff --git a/readme-vars.yml b/readme-vars.yml index 3baf8ed..cba99c5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -1,5 +1,4 @@ --- - # project information project_name: apprise-api project_url: "https://github.com/caronc/apprise-api" @@ -79,6 +78,7 @@ app_setup_block: [] # changelog changelogs: + - { date: "17.10.22:", desc: "Rebase to alpine 3.16, migrate to S6V3"} - { date: "28.02.21:", desc: "Rebase to alpine 3.15." } - { date: "03.11.21:", desc: "Increase uWSGI buffer size to 32kb." } - { date: "16.05.21:", desc: "Add linuxserver wheel index." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-apprise-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-config b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/50-config rename to root/etc/s6-overlay/s6-rc.d/init-apprise-config/run 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 new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-apprise-config/up b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/up new file mode 100755 index 0000000..7867b5b --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-apprise-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-apprise-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-apprise-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-apprise-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-apprise/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/run b/root/etc/s6-overlay/s6-rc.d/svc-apprise/run new file mode 100755 index 0000000..49e2b7c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/run @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash + +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 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-apprise/type b/root/etc/s6-overlay/s6-rc.d/svc-apprise/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-apprise/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-apprise-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-apprise-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-apprise b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-apprise new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/apprise-api/run b/root/etc/services.d/apprise-api/run deleted file mode 100644 index af44878..0000000 --- a/root/etc/services.d/apprise-api/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -cd /app/apprise-api/apprise_api || exit - -exec \ - s6-setuidgid abc /usr/sbin/uwsgi --http-socket=:8000 --enable-threads --plugin=python3 --module=core.wsgi:application --static-map=/s=static --buffer-size=32768