diff --git a/.editorconfig b/.editorconfig index a92f7df..5f150f3 100755 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,6 @@ trim_trailing_whitespace = false indent_style = space indent_size = 2 -[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}] indent_style = space indent_size = 4 diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -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 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 46455f0..b9c30ce 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-htpcmanager/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-htpcmanager/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-htpcmanager/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100644 index 0000000..2df6b61 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -0,0 +1,9 @@ +name: Permission check +on: + pull_request: + paths: + - '**/run' + - '**/finish' +jobs: + permission_check: + uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/Dockerfile b/Dockerfile index 1b50424..08e5240 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 # set version label ARG BUILD_DATE ARG VERSION +ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="notdriz" -ENV PIPFLAGS="--ignore-installed --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/" - RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ @@ -34,21 +35,32 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ git \ - jq \ - py3-pip \ python3 \ vnstat && \ echo "**** install app ****" && \ - git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ + mkdir -p /app/htpcmanager && \ + if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ + HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/HTPC-Manager/HTPC-Manager/commits/master2 \ + | jq -r '. | .sha'); \ + fi && \ + curl -s -o \ + /tmp/htpc.tar.gz -L \ + "https://github.com/HTPC-Manager/HTPC-Manager/archive/${HTPCMANAGER_COMMIT}.tar.gz" && \ + tar xf \ + /tmp/htpc.tar.gz -C \ + /app/htpcmanager --strip-components=1 && \ echo "**** install pip packages ****" && \ sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ - pip3 install -U pip setuptools wheel && \ - pip install ${PIPFLAGS} -r /app/htpcmanager/requirements.txt && \ + python3 -m ensurepip && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r /app/htpcmanager/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 b894db7..79b9fa3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,13 +1,14 @@ -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 ARG BUILD_DATE ARG VERSION +ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="notdriz" -ENV PIPFLAGS="--ignore-installed --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/" - RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ @@ -34,21 +35,32 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ git \ - jq \ - py3-pip \ python3 \ vnstat && \ echo "**** install app ****" && \ - git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ + mkdir -p /app/htpcmanager && \ + if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ + HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/HTPC-Manager/HTPC-Manager/commits/master2 \ + | jq -r '. | .sha'); \ + fi && \ + curl -s -o \ + /tmp/htpc.tar.gz -L \ + "https://github.com/HTPC-Manager/HTPC-Manager/archive/${HTPCMANAGER_COMMIT}.tar.gz" && \ + tar xf \ + /tmp/htpc.tar.gz -C \ + /app/htpcmanager --strip-components=1 && \ echo "**** install pip packages ****" && \ sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ - pip3 install -U pip setuptools wheel && \ - pip install ${PIPFLAGS} -r /app/htpcmanager/requirements.txt && \ + python3 -m ensurepip && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r /app/htpcmanager/requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ + $HOME/.cache \ /tmp/* # add local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a915e91..90db696 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,13 +1,14 @@ -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 ARG BUILD_DATE ARG VERSION +ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="notdriz" -ENV PIPFLAGS="--ignore-installed --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/" - RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ @@ -34,21 +35,32 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ git \ - jq \ - py3-pip \ python3 \ vnstat && \ echo "**** install app ****" && \ - git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ + mkdir -p /app/htpcmanager && \ + if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ + HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/HTPC-Manager/HTPC-Manager/commits/master2 \ + | jq -r '. | .sha'); \ + fi && \ + curl -s -o \ + /tmp/htpc.tar.gz -L \ + "https://github.com/HTPC-Manager/HTPC-Manager/archive/${HTPCMANAGER_COMMIT}.tar.gz" && \ + tar xf \ + /tmp/htpc.tar.gz -C \ + /app/htpcmanager --strip-components=1 && \ echo "**** install pip packages ****" && \ sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ - pip3 install -U pip setuptools wheel && \ - pip install ${PIPFLAGS} -r /app/htpcmanager/requirements.txt && \ + python3 -m ensurepip && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r /app/htpcmanager/requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ + $HOME/.cache \ /tmp/* # add local files diff --git a/Jenkinsfile b/Jenkinsfile index 70bbcad..109a4f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -815,19 +815,19 @@ pipeline { echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -835,13 +835,13 @@ pipeline { docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -987,12 +987,12 @@ pipeline { sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } diff --git a/README.md b/README.md index efcac2f..4a08cd0 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\ | | arm64 | ✅ | arm64v8-\ | -| armhf| ✅ | arm32v7-\ | +| armhf | ✅ | arm32v7-\ | ## Application Setup @@ -78,7 +78,7 @@ services: environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=Etc/UTC volumes: - /path/to/appdata/config:/config ports: @@ -93,11 +93,12 @@ docker run -d \ --name=htpcmanager \ -e PUID=1000 \ -e PGID=1000 \ - -e TZ=Europe/London \ + -e TZ=Etc/UTC \ -p 8085:8085 \ -v /path/to/appdata/config:/config \ --restart unless-stopped \ lscr.io/linuxserver/htpcmanager:latest + ``` ## Parameters @@ -109,7 +110,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 8085` | Application WebUI | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | -| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. | +| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-v /config` | Configuration files. | ## Environment variables from files (Docker secrets) @@ -221,6 +222,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3. * **24.08.22:** - Rebase to alpine 3.15, use linuxserver.io wheel repo. * **08.04.21:** - Fix build. * **10.02.21:** - Rebasing to alpine 3.13. diff --git a/readme-vars.yml b/readme-vars.yml index 509e6a0..bca815b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -39,6 +39,7 @@ app_setup_block: "The webui is found at port 8085. Smartmontools and psutil have # changelog changelogs: + - { date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3." } - { date: "24.08.22:", desc: "Rebase to alpine 3.15, use linuxserver.io wheel repo." } - { date: "08.04.21:", desc: "Fix build." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config deleted file mode 100644 index 75e7f95..0000000 --- a/root/etc/cont-init.d/30-config +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -# permissions -chown -R abc:abc \ - /app diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-htpcmanager-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-htpcmanager-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/run b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/run new file mode 100755 index 0000000..c397899 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/run @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +# permissions +lsiown -R abc:abc \ + /app \ + /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/type b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/up b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/up new file mode 100644 index 0000000..4a0c53b --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-htpcmanager-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/run b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/run new file mode 100755 index 0000000..0bbc543 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/run @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8085" \ + s6-setuidgid abc python3 /app/htpcmanager/Htpc.py \ + --datadir /config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/type b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-htpcmanager/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/svc-vnstat/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-vnstat/run b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/run new file mode 100755 index 0000000..1d9157f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/run @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +exec \ + vnstatd -n diff --git a/root/etc/s6-overlay/s6-rc.d/svc-vnstat/type b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-vnstat/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-htpcmanager-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-htpcmanager-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-htpcmanager b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-htpcmanager new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-vnstat b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-vnstat new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/htpcmanager/run b/root/etc/services.d/htpcmanager/run deleted file mode 100644 index a514260..0000000 --- a/root/etc/services.d/htpcmanager/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -exec \ - s6-setuidgid abc python3 /app/htpcmanager/Htpc.py \ - --datadir /config diff --git a/root/etc/services.d/vnstat/run b/root/etc/services.d/vnstat/run deleted file mode 100644 index 8187340..0000000 --- a/root/etc/services.d/vnstat/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/with-contenv bash - -exec \ - vnstatd -n