diff --git a/Dockerfile b/Dockerfile index 68226fe..ad7997d 100644 --- a/Dockerfile +++ b/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 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 58b550b..9fad9e2 100644 --- a/Dockerfile.aarch64 +++ b/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 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 377a791..70a91c8 100644 --- a/Dockerfile.armhf +++ b/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 diff --git a/README.md b/README.md index c50fee4..1dafb8b 100644 --- a/README.md +++ b/README.md @@ -284,6 +284,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.03.23:** - Rebase to Alpine 3.17. * **18.10.22:** - Fix wrong behavior of password/passwordless sudo * **11.10.22:** - Rebase to Alpine 3.16, migrate to s6v3. * **15.09.22:** - add netcat-openbsd with support for proxies. diff --git a/readme-vars.yml b/readme-vars.yml index 3e5f676..13a2aa8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -93,6 +93,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.03.23:", desc: "Rebase to Alpine 3.17."} - { date: "18.10.22:", desc: "Fix wrong behavior of password/passwordless sudo"} - { date: "11.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3."} - { date: "15.09.22:", desc: "add netcat-openbsd with support for proxies."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run index 5906562..0af1240 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/run +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -1,54 +1,56 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash USER_NAME=${USER_NAME:-linuxserver.io} PUID=${PUID:-911} PGID=${PGID:-911} -[[ "$USER_NAME" != "abc" ]] && \ - usermod -l "$USER_NAME" abc && \ +if [[ "$USER_NAME" != "abc" ]]; then + usermod -l "$USER_NAME" abc groupmod -n "$USER_NAME" abc +fi groupmod -o -g "$PGID" "$USER_NAME" usermod -o -u "$PUID" "$USER_NAME" +cat /etc/s6-overlay/s6-rc.d/init-adduser/branding + +if [[ -f /donate.txt ]]; then + echo ' +To support the app dev(s) visit:' + cat /donate.txt +fi echo ' -------------------------------------- - _ () - | | ___ _ __ - | | / __| | | / \ - | | \__ \ | | | () | - |_| |___/ |_| \__/ - - -Brought to you by linuxserver.io -We gratefully accept donations at: +To support LSIO projects visit: https://www.linuxserver.io/donate/ -------------------------------------- + +─────────────────────────────────────── GID/UID --------------------------------------' +───────────────────────────────────────' echo " -User uid: $(id -u "$USER_NAME") -User gid: $(id -g "$USER_NAME") -------------------------------------- +User UID: $(id -u "${USER_NAME}") +User GID: $(id -g "${USER_NAME}") +─────────────────────────────────────── " time32="$(date +%Y)" if [[ "${time32}" == "1970" || "${time32}" == "1969" ]] && [ "$(uname -m)" == "armv7l" ]; then - echo ' -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - -Your DockerHost is most likely running an outdated version of libseccomp - -To fix this, please visit https://docs.linuxserver.io/faq#libseccomp - -Some apps might not behave correctly without this - -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + echo ' +╔═════════════════════════════════════════════════════════════════════════════╗ +║ ║ +║ Your Docker Host is running an outdated version of libseccomp ║ +║ ║ +║ To fix this, please visit https://docs.linuxserver.io/faq#libseccomp ║ +║ ║ +║ Apps will not behave correctly without this ║ +║ ║ +╚═════════════════════════════════════════════════════════════════════════════╝ ' + sleep infinity fi -chown "$USER_NAME":"$USER_NAME" /app -chown "$USER_NAME":"$USER_NAME" /config -chown "$USER_NAME":"$USER_NAME" /defaults +lsiown "${USER_NAME}":"${USER_NAME}" /app +lsiown "${USER_NAME}":"${USER_NAME}" /config +lsiown "${USER_NAME}":"${USER_NAME}" /defaults diff --git a/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run b/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run index d6b8c83..a2f9672 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run @@ -1,5 +1,4 @@ #!/usr/bin/with-contenv bash - # shellcheck shell=bash # create folders @@ -33,7 +32,7 @@ echo "${USER_NAME}:${USER_PASSWORD}" | chpasswd # symlink out ssh config directory if [[ ! -L /etc/ssh ]]; then - if [ ! -f /config/ssh_host_keys/sshd_config ]; then + if [[ ! -f /config/ssh_host_keys/sshd_config ]]; then sed -i '/#PidFile/c\PidFile \/config\/sshd.pid' /etc/ssh/sshd_config cp -a /etc/ssh/sshd_config /config/ssh_host_keys/ fi @@ -110,11 +109,11 @@ if [[ ! -f /config/logs/loginfo.txt ]]; then fi # permissions -chown -R "${USER_NAME}":"${USER_NAME}" \ +lsiown -R "${USER_NAME}":"${USER_NAME}" \ /config -chmod go-w \ +lsiown go-w \ /config -chmod 700 \ +lsiown 700 \ /config/.ssh -chmod 600 \ +lsiown 600 \ /config/.ssh/authorized_keys diff --git a/root/etc/s6-overlay/s6-rc.d/log-openssh-server/run b/root/etc/s6-overlay/s6-rc.d/log-openssh-server/run index d4db327..a4200cd 100755 --- a/root/etc/s6-overlay/s6-rc.d/log-openssh-server/run +++ b/root/etc/s6-overlay/s6-rc.d/log-openssh-server/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash USER_NAME=${USER_NAME:-linuxserver.io} diff --git a/root/etc/s6-overlay/s6-rc.d/svc-openssh-server/run b/root/etc/s6-overlay/s6-rc.d/svc-openssh-server/run index 1be7951..e1b6ad1 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-openssh-server/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-openssh-server/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash USER_NAME=${USER_NAME:-linuxserver.io}