Merge pull request #13 from linuxserver/3.17

Author: thespad

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,8 +12,7 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    jq && \
+    build-base && \
   echo "**** fetch source code ****" && \
   if [ -z ${ENDLESSH_RELEASE+x} ]; then \
     ENDLESSH_RELEASE=$(curl -sX GET "https://api.github.com/repos/skeeto/endlessh/commits/master" \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,8 +12,7 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    jq && \
+    build-base && \
   echo "**** fetch source code ****" && \
   if [ -z ${ENDLESSH_RELEASE+x} ]; then \
     ENDLESSH_RELEASE=$(curl -sX GET "https://api.github.com/repos/skeeto/endlessh/commits/master" \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,8 +12,7 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    jq && \
+    build-base && \
   echo "**** fetch source code ****" && \
   if [ -z ${ENDLESSH_RELEASE+x} ]; then \
     ENDLESSH_RELEASE=$(curl -sX GET "https://api.github.com/repos/skeeto/endlessh/commits/master" \

README.md

@@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.03.23:** - Rebase to Alpine 3.17.
 * **23.09.22:** - Migrate to s6v3.
 * **20.07.22:** - Rebase to Alpine 3.16.
 * **16.04.22:** - Rebase to Alpine 3.15.

readme-vars.yml

@@ -54,6 +54,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.03.23:", desc: "Rebase to Alpine 3.17." }
   - { 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." }

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

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

root/etc/s6-overlay/s6-rc.d/log-endlessh/run

@@ -1,6 +1,7 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
-if [ "${LOGFILE}" == "true" ]; then
+if [[ "${LOGFILE}" == "true" ]]; then
     exec \
         s6-setuidgid abc s6-log n30 s1000000 S30000000 T !"gzip -nq9" /config/logs/endlessh
 else

root/etc/s6-overlay/s6-rc.d/svc-endlessh/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 export \
     MSDELAY=${MSDELAY:-10000} \
@@ -7,7 +8,7 @@ export \
     BINDFAMILY=$(test v4 = v"${BINDFAMILY}" -o v6 = v"${BINDFAMILY}" && echo -"${BINDFAMILY}")
 
 exec 2>&1 \
-    s6-notifyoncheck -d -n 60 -w 5000 -c "nc -z 127.0.0.1 2222" \
+    s6-notifyoncheck -d -n 60 -w 5000 -c "nc -z localhost 2222" \
         s6-setuidgid abc \
             /app/endlessh/endlessh \
             -v \