Rebase nightly to 3.16, migrate to s6v3

This commit is contained in:
TheSpad
2022-10-27 19:00:16 +01:00
parent aa385f1f43
commit d8a4d50bf8
17 changed files with 19 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 FROM ghcr.io/linuxserver/baseimage-alpine:3.16
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -14,8 +14,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apk add -U --upgrade --no-cache \ apk add -U --upgrade --no-cache \
curl \
jq \
icu-libs \ icu-libs \
sqlite-libs && \ sqlite-libs && \
echo "**** install prowlarr ****" && \ echo "**** install prowlarr ****" && \
@@ -42,4 +40,5 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9696 EXPOSE 9696
VOLUME /config VOLUME /config

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -14,8 +14,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apk add -U --upgrade --no-cache \ apk add -U --upgrade --no-cache \
curl \
jq \
icu-libs \ icu-libs \
sqlite-libs && \ sqlite-libs && \
echo "**** install prowlarr ****" && \ echo "**** install prowlarr ****" && \
@@ -42,4 +40,5 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9696 EXPOSE 9696
VOLUME /config VOLUME /config

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -14,8 +14,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apk add -U --upgrade --no-cache \ apk add -U --upgrade --no-cache \
curl \
jq \
icu-libs \ icu-libs \
sqlite-libs && \ sqlite-libs && \
echo "**** install prowlarr ****" && \ echo "**** install prowlarr ****" && \
@@ -42,4 +40,5 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 9696 EXPOSE 9696
VOLUME /config VOLUME /config

View File

@@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **27.10.22:** - Rebase nightly to Alpine 3.16, migrate to s6v3.
* **04.02.22:** - Rebase nightly branch to Alpine. * **04.02.22:** - Rebase nightly branch to Alpine.
* **28.12.21:** - Add nightly-alpine branch. * **28.12.21:** - Add nightly-alpine branch.
* **06.06.21:** - Initial realease. * **06.06.21:** - Initial realease.

View File

@@ -43,6 +43,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "27.10.22:", desc: "Rebase nightly to Alpine 3.16, migrate to s6v3." }
- { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." } - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." }
- { date: "28.12.21:", desc: "Add nightly-alpine branch." } - { date: "28.12.21:", desc: "Add nightly-alpine branch." }
- { date: "06.06.21:", desc: "Initial realease." } - { date: "06.06.21:", desc: "Initial realease." }

View File

@@ -1,6 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash
# permissions # permissions
chown -R abc:abc \ chown -R abc:abc \
/config /config

View File

@@ -0,0 +1 @@
oneshot

View File

@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-prowlarr-config/run

View File

@@ -0,0 +1 @@
3

View File

@@ -0,0 +1,6 @@
#!/usr/bin/with-contenv bash
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 9696" \
cd /app/prowlarr/bin s6-setuidgid abc /app/lidaprowlarrrr/bin/Lidarr \
-nobrowser -data=/config

View File

@@ -0,0 +1 @@
longrun

View File

@@ -1,9 +0,0 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
cd /app/prowlarr/bin || exit
exec \
s6-setuidgid abc /app/prowlarr/bin/Prowlarr \
-nobrowser -data=/config