From 74685f60428b1fcafad09eee865b959122d8bd07 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 12 Jul 2026 01:04:38 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Update=20to=20latest=20docker=20?= =?UTF-8?q?template=20revision=20=F0=9F=94=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - .env.scripts: synced version stamp to current template - Dockerfile: fixed trailing space in PACK_LIST; restored image.source LABEL to GitHub URL after gen-dockerfile mis-set it to Docker Hub - rootfs/usr/local/bin/entrypoint.sh: regenerated from current template - rootfs/usr/local/etc/docker/functions/entrypoint.sh: replaced from current template - rootfs/root/docker/setup/00-init.sh through 07-cleanup.sh: regenerated from current template - rootfs/etc/profile.d/go.sh: migrated to rootfs/tmp/etc/profile.d/go.sh per current rootfs layout - .gitignore: added rootfs/tmp/ exception so migrated rootfs/tmp files stay tracked Dockerfile .env.scripts .gitignore rootfs/etc/profile.d/go.sh rootfs/root/docker/setup/00-init.sh rootfs/root/docker/setup/01-system.sh rootfs/root/docker/setup/02-packages.sh rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/04-users.sh rootfs/root/docker/setup/05-custom.sh rootfs/root/docker/setup/06-post.sh rootfs/root/docker/setup/07-cleanup.sh rootfs/tmp/ rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh --- .env.scripts | 4 +- .gitignore | 2 + Dockerfile | 2 +- rootfs/root/docker/setup/00-init.sh | 4 +- rootfs/root/docker/setup/01-system.sh | 4 +- rootfs/root/docker/setup/02-packages.sh | 4 +- rootfs/root/docker/setup/03-files.sh | 4 +- rootfs/root/docker/setup/04-users.sh | 4 +- rootfs/root/docker/setup/05-custom.sh | 4 +- rootfs/root/docker/setup/06-post.sh | 4 +- rootfs/root/docker/setup/07-cleanup.sh | 4 +- rootfs/{ => tmp}/etc/profile.d/go.sh | 0 rootfs/usr/local/bin/entrypoint.sh | 2 +- .../local/etc/docker/functions/entrypoint.sh | 37 ++++++++++++++++++- 14 files changed, 57 insertions(+), 22 deletions(-) rename rootfs/{ => tmp}/etc/profile.d/go.sh (100%) diff --git a/.env.scripts b/.env.scripts index d643804..5429b06 100644 --- a/.env.scripts +++ b/.env.scripts @@ -1,10 +1,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092001-git +##@Version : 202607112108-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:01:29 PM EDT 2026 +# @@Created : Sat Jul 11 09:08:33 PM EDT 2026 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # @@Changelog : newScript diff --git a/.gitignore b/.gitignore index 8e7fe5f..fe94303 100644 --- a/.gitignore +++ b/.gitignore @@ -206,6 +206,8 @@ tmp/ *.tmp *.cache .cache/ +!rootfs/tmp/ +!rootfs/tmp/** ### Test and coverage ### coverage/ diff --git a/Dockerfile b/Dockerfile index d1bd9fb..9c880b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG PATH -ARG PACK_LIST="git make bash tini ca-certificates openssh-client curl wget tar tzdata jq build-base gcc musl-dev pkgconf openssl-dev libffi-dev zlib-dev linux-headers protobuf protobuf-dev" +ARG PACK_LIST="git make bash tini ca-certificates openssh-client curl wget tar tzdata jq build-base gcc musl-dev pkgconf openssl-dev libffi-dev zlib-dev linux-headers protobuf protobuf-dev " ENV ENV=~/.profile ENV SHELL="/bin/sh" diff --git a/rootfs/root/docker/setup/00-init.sh b/rootfs/root/docker/setup/00-init.sh index 7ad5d15..e58f954 100755 --- a/rootfs/root/docker/setup/00-init.sh +++ b/rootfs/root/docker/setup/00-init.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:30 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:27 PM EDT 2026 # @@File : 00-init.sh # @@Description : script to run init # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh index 812a08c..5ba4f32 100755 --- a/rootfs/root/docker/setup/01-system.sh +++ b/rootfs/root/docker/setup/01-system.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:31 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:27 PM EDT 2026 # @@File : 01-system.sh # @@Description : script to run system # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh index cc53409..3553dbc 100755 --- a/rootfs/root/docker/setup/02-packages.sh +++ b/rootfs/root/docker/setup/02-packages.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:32 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:28 PM EDT 2026 # @@File : 02-packages.sh # @@Description : script to run packages # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index da42dab..258cdec 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:32 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:28 PM EDT 2026 # @@File : 03-files.sh # @@Description : script to run files # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/04-users.sh b/rootfs/root/docker/setup/04-users.sh index d017dcd..0cef87c 100755 --- a/rootfs/root/docker/setup/04-users.sh +++ b/rootfs/root/docker/setup/04-users.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:32 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:29 PM EDT 2026 # @@File : 04-users.sh # @@Description : script to run users # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh index 0880677..224c87f 100755 --- a/rootfs/root/docker/setup/05-custom.sh +++ b/rootfs/root/docker/setup/05-custom.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:32 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:29 PM EDT 2026 # @@File : 05-custom.sh # @@Description : script to run custom # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh index 59a2528..2a95835 100755 --- a/rootfs/root/docker/setup/06-post.sh +++ b/rootfs/root/docker/setup/06-post.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:32 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:29 PM EDT 2026 # @@File : 06-post.sh # @@Description : script to run post # @@Changelog : newScript diff --git a/rootfs/root/docker/setup/07-cleanup.sh b/rootfs/root/docker/setup/07-cleanup.sh index a4b810a..a8aaeee 100755 --- a/rootfs/root/docker/setup/07-cleanup.sh +++ b/rootfs/root/docker/setup/07-cleanup.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202607092021-git +##@Version : 202607112314-git # @@Author : CasjaysDev # @@Contact : CasjaysDev # @@License : WTFPL # @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Thu Jul 9 08:21:33 PM EDT 2026 +# @@Created : Sat Jul 11 11:14:30 PM EDT 2026 # @@File : 07-cleanup.sh # @@Description : script to run cleanup # @@Changelog : newScript diff --git a/rootfs/etc/profile.d/go.sh b/rootfs/tmp/etc/profile.d/go.sh similarity index 100% rename from rootfs/etc/profile.d/go.sh rename to rootfs/tmp/etc/profile.d/go.sh diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index a73004b..3a5db29 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -7,7 +7,7 @@ # @@License : WTFPL # @@ReadME : entrypoint.sh --help # @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments -# @@Created : Thursday, Jul 09, 2026 20:21 EDT +# @@Created : Saturday, Jul 11, 2026 23:13 EDT # @@File : entrypoint.sh # @@Description : Entrypoint file for go # @@Changelog : New script diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index cd3ad72..5d25d12 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -1124,7 +1124,7 @@ __start_init_scripts() { __setup_mta() { # Check for an installed MTA binary — directories alone cannot be trusted because # /etc/postfix ships in some base images (casjaysdev/alpine) even without postfix. - command -v ssmtp &>/dev/null || command -v postfix &>/dev/null || return 0 + command -v msmtp &>/dev/null || command -v ssmtp &>/dev/null || command -v postfix &>/dev/null || return 0 local exitCode=0 # Extract server and port only when EMAIL_RELAY contains a colon local relay_server="" relay_port="" @@ -1148,8 +1148,41 @@ __setup_mta() { local relay_use_tls="Yes" local relay_smtp_tls="yes" [ "$relay_port" = "25" ] && relay_use_tls="No" && relay_smtp_tls="no" + ################# msmtp relay setup + if command -v msmtp &>/dev/null; then + [ -d "/config/msmtp" ] || mkdir -p "/config/msmtp" + [ -f "/etc/msmtprc" ] && __rm "/etc/msmtprc" + if [ ! -f "/config/msmtp/msmtprc" ]; then + cat >"/config/msmtp/msmtprc" </dev/null || true + # sendmail compat symlink + if [ ! -e "/usr/sbin/sendmail" ] && command -v msmtp &>/dev/null; then + __symlink "$(command -v msmtp)" "/usr/sbin/sendmail" + fi + [ "$DEBUGGER" = "on" ] && echo "Done setting up msmtp" + fi + ################# sSMTP relay setup - if command -v ssmtp &>/dev/null; then + elif command -v ssmtp &>/dev/null; then [ -d "/config/ssmtp" ] || mkdir -p "/config/ssmtp" [ -f "/etc/ssmtp/ssmtp.conf" ] && __rm "/etc/ssmtp/ssmtp.conf" symlink_files="$(__find_file_relative "/config/ssmtp")"