Rebase to 3.17, migrate to s6v3

This commit is contained in:
TheSpad
2023-01-17 18:01:23 +00:00
parent ce75c340c7
commit f1b05cdfb6
19 changed files with 43 additions and 21 deletions

View File

@@ -0,0 +1,12 @@
name: Comment on invalid interaction
on:
issues:
types:
- labeled
jobs:
add-comment-on-invalid:
if: github.event.label.name == 'invalid'
permissions:
issues: write
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
secrets: inherit

View File

@@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -14,8 +16,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 radarr ****" && \ echo "**** install radarr ****" && \
@@ -41,4 +41,5 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 7878 EXPOSE 7878
VOLUME /config VOLUME /config

View File

@@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -13,8 +15,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 radarr ****" && \ echo "**** install radarr ****" && \
@@ -40,4 +40,5 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 7878 EXPOSE 7878
VOLUME /config VOLUME /config

View File

@@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -14,8 +16,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 radarr ****" && \ echo "**** install radarr ****" && \
@@ -41,4 +41,5 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 7878 EXPOSE 7878
VOLUME /config VOLUME /config

View File

@@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **17.01.23:** - Rebase master branch to Alpine 3.17, migrate to s6v3.
* **06.06.22:** - Rebase master branch to Alpine 3.15. * **06.06.22:** - Rebase master branch to Alpine 3.15.
* **20.02.22:** - Rebase develop branch to Alpine. * **20.02.22:** - Rebase develop branch to Alpine.
* **04.02.22:** - Rebase nightly branch to Alpine and deprecate nightly-alpine branch. * **04.02.22:** - Rebase nightly branch to Alpine and deprecate nightly-alpine branch.

View File

@@ -56,6 +56,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "17.01.23:", desc: "Rebase master branch to Alpine 3.17, migrate to s6v3." }
- { date: "06.06.22:", desc: "Rebase master branch to Alpine 3.15." } - { date: "06.06.22:", desc: "Rebase master branch to Alpine 3.15." }
- { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
- { date: "04.02.22:", desc: "Rebase nightly branch to Alpine and deprecate nightly-alpine branch." } - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine and deprecate nightly-alpine branch." }

View File

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

View File

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

View File

@@ -0,0 +1 @@
oneshot

View File

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

View File

@@ -0,0 +1 @@
3

View File

@@ -0,0 +1,7 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 7878" \
cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \
-nobrowser -data=/config

View File

@@ -0,0 +1 @@
longrun

View File

@@ -1,7 +0,0 @@
#!/usr/bin/with-contenv bash
cd /app/radarr/bin || exit
exec \
s6-setuidgid abc /app/radarr/bin/Radarr \
-nobrowser -data=/config