From a4c80dd9e8564afb746def65d233c647de06e6d1 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 3 Sep 2023 01:50:15 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Updated=20functions=20a?= =?UTF-8?q?nd=20entrypoint=20files=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh --- rootfs/usr/local/bin/entrypoint.sh | 24 +++++++++++-------- .../local/etc/docker/functions/entrypoint.sh | 6 ++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index 12034ba..002d85a 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202309022254-git +##@Version : 202309030145-git # @@Author : Jason Hempstead -# @@Contact : jason@casjaysdev.pro +# @@Contact : git-admin@casjaysdev.pro # @@License : WTFPL -# @@ReadME : docker-entrypoint --help +# @@ReadME : entrypoint.sh --help # @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments -# @@Created : Saturday, Sep 02, 2023 22:54 EDT -# @@File : docker-entrypoint -# @@Description : -# @@Changelog : New script -# @@TODO : Better documentation -# @@Other : -# @@Resource : +# @@Created : Sunday, Sep 03, 2023 01:45 EDT +# @@File : entrypoint.sh +# @@Description : entrypoint script for docker container +# @@Changelog : newScript +# @@TODO : Refactor code +# @@Other : +# @@Resource : # @@Terminal App : no # @@sudo/root : no # @@Template : other/docker-entrypoint @@ -105,6 +105,10 @@ export TZ="${TZ:-${TIMEZONE:-America/New_York}}" export HOSTNAME="${FULL_DOMAIN_NAME:-${SERVER_HOSTNAME:-$HOSTNAME}}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories +export SSL_DIR="${SSL_DIR:-/config/ssl}" +export SSL_CA="${SSL_CERT:-/config/ssl/ca.crt}" +export SSL_KEY="${SSL_KEY:-/config/ssl/localhost.pem}" +export SSL_CERT="${SSL_CERT:-/config/ssl/localhost.crt}" export BACKUP_DIR="${BACKUP_DIR:-/data/backups}" export LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}" export DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}" diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index d315b2a..db0e55b 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202308281453-git +##@Version : 202309030111-git # @@Author : Jason Hempstead # @@Contact : git-admin@casjaysdev.pro -# @@License : WTFPL +# @@License : LICENSE.md # @@ReadME : docker-entrypoint --help # @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments -# @@Created : Monday, Aug 28, 2023 14:53 EDT +# @@Created : Sunday, Sep 03, 2023 01:40 EDT # @@File : docker-entrypoint # @@Description : functions for my docker containers # @@Changelog : newScript