Merge pull request #12 from linuxserver/s6v3-main

Migrate endlessh to s6v3

Author: aptalca

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16-fb0ed076-ls25
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -11,7 +11,6 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    curl \
     jq && \
   echo "**** fetch source code ****" && \
   if [ -z ${ENDLESSH_RELEASE+x} ]; then \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16-fb0ed076-ls25
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -11,7 +11,6 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    curl \
     jq && \
   echo "**** fetch source code ****" && \
   if [ -z ${ENDLESSH_RELEASE+x} ]; then \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16-fb0ed076-ls25
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -11,7 +11,6 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    curl \
     jq && \
   echo "**** fetch source code ****" && \
   if [ -z ${ENDLESSH_RELEASE+x} ]; then \

README.md

@@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.0.22:** - Migrate to s6v3.
 * **20.07.22:** - Rebase to Alpine 3.16.
 * **16.04.22:** - Rebase to Alpine 3.15.
 * **07.10.21:** - Fix typo on MAXLINES var.

readme-vars.yml

@@ -54,6 +54,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.09.22:", desc: "Migrate to s6v3." }
   - { date: "20.07.22:", desc: "Rebase to Alpine 3.16." }
   - { date: "16.04.22:", desc: "Rebase to Alpine 3.15." }
   - { date: "07.10.21:", desc: "Fix typo on MAXLINES var." }

root/etc/cont-init.d/30-config

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+if [ "${LOGFILE}" == "true" ]; then
+    mkdir -p /config/logs/endlessh
+fi
+
+# permissions
+chown -R abc:abc \
+    /config \

root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-endlessh-config

@@ -0,0 +1 @@
+oneshot