From 9a7ee5a0dc9f6fc62d893d8f0b5e37936e11dd79 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 25 Feb 2023 15:55:08 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- Dockerfile | 6 +++--- rootfs/usr/local/bin/entrypoint.sh | 17 +++++++++++------ rootfs/usr/local/bin/start-tor.sh | 4 ++-- .../local/share/template-files/config/.gitkeep | 0 5 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 rootfs/usr/local/share/template-files/config/.gitkeep diff --git a/.gitignore b/.gitignore index 1922784..e745d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# gitignore created on 02/25/23 at 13:04 +# gitignore created on 02/25/23 at 15:50 # Disable reminder in prompt ignoredirmessage diff --git a/Dockerfile b/Dockerfile index a1f5283..783a17d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG LICENSE="MIT" ARG IMAGE_NAME="tor" ARG PHP_SERVER="tor" -ARG BUILD_DATE="Sat Feb 25 01:02:48 PM EST 2023" +ARG BUILD_DATE="Sat Feb 25 03:50:56 PM EST 2023" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" @@ -16,9 +16,9 @@ ARG NODE_VERSION="system" ARG NODE_MANAGER="system" ARG USER="root" -ARG DISTRO_VERSION="edge" +ARG DISTRO_VERSION="3.17" ARG CONTAINER_VERSION="latest" -ARG IMAGE_VERSION="latest" +ARG IMAGE_VERSION="${DISTRO_VERSION}" ARG BUILD_VERSION="${DISTRO_VERSION}" ARG IMAGE_REPO="${IMAGE_REPO}" diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index 8242e93..9d96da6 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 : 202302251304-git +##@Version : 202302251550-git # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.com # @@License : WTFPL # @@ReadME : entrypoint.sh --help # @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments -# @@Created : Saturday, Feb 25, 2023 13:04 EST +# @@Created : Saturday, Feb 25, 2023 15:50 EST # @@File : entrypoint.sh # @@Description : entrypoint point for tor # @@Changelog : New script # @@TODO : Better documentation -# @@Other : -# @@Resource : +# @@Other : +# @@Resource : # @@Terminal App : no # @@sudo/root : no # @@Template : other/docker-entrypoint @@ -102,7 +102,7 @@ CONTAINER_IP6_ADDRESS="$(__get_ip6)" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Additional variables and variable overrides SERVICE_NAME="tor" -SERVICES_LIST="tor " +SERVICES_LIST="tor php" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Show start message ENTRYPOINT_MESSAGE="false" @@ -157,7 +157,6 @@ fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Create directories [ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR" -[ -d "/run/tor" ] || mkdir -p "/run/tor" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Create files @@ -266,6 +265,12 @@ if [ -d "/config" ]; then done fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +if [ -d "$DEFAULT_DATA_DIR/htdocs/www" ] && [ ! -d "$WWW_ROOT_DIR" ]; then + mkdir -p "$WWW_ROOT_DIR" + cp -Rf "$DEFAULT_DATA_DIR/htdocs/www/" "$WWW_ROOT_DIR" + [ -f "$WWW_ROOT_DIR/htdocs/www/server-health" ] || echo "OK" >"$WWW_ROOT_DIR/htdocs/www/server-health" +fi +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Unset unneeded variables unset SET_USR_BIN create_bin create_bin_name create_template create_template_name unset create_data create_data_name create_config create_config_name create_conf create_conf_name diff --git a/rootfs/usr/local/bin/start-tor.sh b/rootfs/usr/local/bin/start-tor.sh index c1d7492..e7adf83 100755 --- a/rootfs/usr/local/bin/start-tor.sh +++ b/rootfs/usr/local/bin/start-tor.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # shellcheck shell=bash # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202302251304-git +##@Version : 202302251550-git # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.com # @@License : WTFPL # @@ReadME : start-tor.sh --help # @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments -# @@Created : Saturday, Feb 25, 2023 13:04 EST +# @@Created : Saturday, Feb 25, 2023 15:50 EST # @@File : start-tor.sh # @@Description : script to start tor # @@Changelog : New script diff --git a/rootfs/usr/local/share/template-files/config/.gitkeep b/rootfs/usr/local/share/template-files/config/.gitkeep new file mode 100644 index 0000000..e69de29