From 28288018d70f99bd64dcfe067940c652b210758c Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 24 May 2025 10:24:47 +1200 Subject: [PATCH] Updates for new ver --- caddy/_default.env | 8 -------- caddy/config/.template_info.env | 11 +++++++++++ caddy/config/service.env | 9 +++------ simple-object-storage/_default.env | 12 ------------ simple-object-storage/config/.template_info.env | 15 +++++++++++++++ simple-object-storage/config/service.env | 6 ++++++ squashkiwi/_default.env | 10 ---------- squashkiwi/config/.template_info.env | 14 ++++++++++++++ squashkiwi/config/service.env | 5 ++++- static-website/_default.env | 5 ----- static-website/config/.template_info.env | 6 ++++++ static-website/config/service.env | 8 ++++---- watchtower/_default.env | 11 ----------- watchtower/config/.template_info.env | 11 +++++++++++ watchtower/config/service.env | 7 +++++-- 15 files changed, 79 insertions(+), 59 deletions(-) delete mode 100644 caddy/_default.env delete mode 100644 simple-object-storage/_default.env delete mode 100644 squashkiwi/_default.env delete mode 100644 static-website/_default.env delete mode 100644 watchtower/_default.env diff --git a/caddy/_default.env b/caddy/_default.env deleted file mode 100644 index 1473fca..0000000 --- a/caddy/_default.env +++ /dev/null @@ -1,8 +0,0 @@ -# Service settings specific to this server - -# Image settings -IMAGE_REGISTRY="docker.io" -IMAGE_REPO="caddy" - -DATA_VOLUME=caddy_data -CONFIG_VOLUME=caddy_config diff --git a/caddy/config/.template_info.env b/caddy/config/.template_info.env index ee61c54..6edcbf8 100644 --- a/caddy/config/.template_info.env +++ b/caddy/config/.template_info.env @@ -1,2 +1,13 @@ # Template to use - always required! TEMPLATE=caddy +REQUIRES_HOST_ROOT=false +REQUIRES_DOCKER=true +REQUIRES_DOCKER_ROOT=true + +# Image settings +IMAGE_REGISTRY="docker.io" +IMAGE_REPO="caddy" + +# Volume settings +DATA_VOLUME=caddy_data +CONFIG_VOLUME=caddy_config diff --git a/caddy/config/service.env b/caddy/config/service.env index c4f3976..92ef504 100644 --- a/caddy/config/service.env +++ b/caddy/config/service.env @@ -1,10 +1,7 @@ # Service settings specific to this server -# (can also override anything in the _default.env file in the template to make it specific to this server) +# (can also override anything in the .template_info.env file in the template to make it specific to this server) CONTAINER_NAME=caddy IMAGE_TAG="latest" -# Scripts will have these environment variables set, plus those in _default.env, plus: -# SERVER, SERVICE, CONFIG_PATH -# CONFIG_PATH points to this directory! - - +# Server Settings +SSH_USER="root" diff --git a/simple-object-storage/_default.env b/simple-object-storage/_default.env deleted file mode 100644 index 802395b..0000000 --- a/simple-object-storage/_default.env +++ /dev/null @@ -1,12 +0,0 @@ -# Service settings specific to this server - -# Image settings -IMAGE_REGISTRY="gitea.jde.nz" -IMAGE_REPO="public/simple-object-storage" -IMAGE_TAG="latest" - -# Container settings -CONTAINER_NAME="simple-object-storage" - -# Volume settings -VOLUME_NAME="simple-object-storage" diff --git a/simple-object-storage/config/.template_info.env b/simple-object-storage/config/.template_info.env index 1c2ba83..329e5a1 100644 --- a/simple-object-storage/config/.template_info.env +++ b/simple-object-storage/config/.template_info.env @@ -1,2 +1,17 @@ # Template to use - always required! TEMPLATE=simple-object-storage +REQUIRES_HOST_ROOT=false +REQUIRES_DOCKER=true +REQUIRES_DOCKER_ROOT=true + + +# Image settings +IMAGE_REGISTRY="gitea.jde.nz" +IMAGE_REPO="public/simple-object-storage" +IMAGE_TAG="latest" + +# Container settings +CONTAINER_NAME="simple-object-storage" + +# Volume settings +VOLUME_NAME="simple-object-storage" diff --git a/simple-object-storage/config/service.env b/simple-object-storage/config/service.env index dd27f69..e3ceee4 100644 --- a/simple-object-storage/config/service.env +++ b/simple-object-storage/config/service.env @@ -1,4 +1,10 @@ +# Service settings specific to this server +# (can also override anything in the .template_info.env file in the template to make it specific to this server) + # note the port and write tokens are not set here, they are set in the sos_config.json file. CONTAINER_NAME="simple-object-storage" VOLUME_NAME="simple-object-storage" + +# Server Settings +SSH_USER="root" diff --git a/squashkiwi/_default.env b/squashkiwi/_default.env deleted file mode 100644 index d1c0279..0000000 --- a/squashkiwi/_default.env +++ /dev/null @@ -1,10 +0,0 @@ -# Application settings -CONTAINER_PORT=8181 - -# Deployment settings -CONTAINER_NAME="squashkiwi" - -# Image settings -IMAGE_REGISTRY="gitea.jde.nz" -IMAGE_REPO="squashkiwi/squashkiwi" -IMAGE_TAG="latest" diff --git a/squashkiwi/config/.template_info.env b/squashkiwi/config/.template_info.env index ab4665d..2f0303c 100644 --- a/squashkiwi/config/.template_info.env +++ b/squashkiwi/config/.template_info.env @@ -1,2 +1,16 @@ # Template to use - always required! TEMPLATE=squashkiwi +REQUIRES_HOST_ROOT=false +REQUIRES_DOCKER=true +REQUIRES_DOCKER_ROOT=true + +# Application settings +CONTAINER_PORT=8181 + +# Deployment settings +CONTAINER_NAME="squashkiwi" + +# Image settings +IMAGE_REGISTRY="gitea.jde.nz" +IMAGE_REPO="squashkiwi/squashkiwi" +IMAGE_TAG="latest" diff --git a/squashkiwi/config/service.env b/squashkiwi/config/service.env index e9a710a..74ddf8c 100644 --- a/squashkiwi/config/service.env +++ b/squashkiwi/config/service.env @@ -1,6 +1,9 @@ # Service settings specific to this server -# (can also override anything in the _basic.env file in the template to make it specific to this server) +# (can also override anything in the .template_info.env file in the template to make it specific to this server) HOST_PORT=80 LOCAL_DATA_FOLDER="/home/dropshell/example-squashkiwi" IMAGE_TAG="latest" + +# Server Settings +SSH_USER="root" \ No newline at end of file diff --git a/static-website/_default.env b/static-website/_default.env deleted file mode 100644 index a5e0c2d..0000000 --- a/static-website/_default.env +++ /dev/null @@ -1,5 +0,0 @@ -# Service settings specific to this server - -# Image settings -IMAGE_REGISTRY="docker.io" -IMAGE_REPO="nginx" diff --git a/static-website/config/.template_info.env b/static-website/config/.template_info.env index 34ed3c8..208ac1b 100644 --- a/static-website/config/.template_info.env +++ b/static-website/config/.template_info.env @@ -1,2 +1,8 @@ # Template to use - always required! TEMPLATE=static-website +REQUIRES_HOST_ROOT=false +REQUIRES_DOCKER=true +REQUIRES_DOCKER_ROOT=true + +IMAGE_REGISTRY="docker.io" +IMAGE_REPO="nginx" diff --git a/static-website/config/service.env b/static-website/config/service.env index 08ab81d..4849907 100644 --- a/static-website/config/service.env +++ b/static-website/config/service.env @@ -1,12 +1,12 @@ # Service settings specific to this server -# (can also override anything in the _default.env file in the template to make it specific to this server) +# (can also override anything in the .template_info.env file in the template to make it specific to this server) + HOST_PORT=60123 LOCAL_DATA_FOLDER="/home/dropshell/nginx-example-website" CONTAINER_NAME="example-nginx" IMAGE_TAG="latest" -# Scripts will have these environment variables set, plus those in _default.env, plus: -# SERVER, SERVICE, CONFIG_PATH -# CONFIG_PATH points to this directory! +# Server Settings +SSH_USER="root" diff --git a/watchtower/_default.env b/watchtower/_default.env deleted file mode 100644 index ee38801..0000000 --- a/watchtower/_default.env +++ /dev/null @@ -1,11 +0,0 @@ -# Service settings -CONTAINER_NAME=watchtower - -# Interval in seconds between checks. -# Default is 1800 seconds (30 minutes). -INTERVAL=1800 - -# Image settings -IMAGE_REGISTRY="docker.io" -IMAGE_REPO="containrrr/watchtower" -IMAGE_TAG="latest" diff --git a/watchtower/config/.template_info.env b/watchtower/config/.template_info.env index 8109ee4..1e9fb4f 100644 --- a/watchtower/config/.template_info.env +++ b/watchtower/config/.template_info.env @@ -1,3 +1,14 @@ # Template to use - always required! TEMPLATE=watchtower +REQUIRES_HOST_ROOT=false +REQUIRES_DOCKER=true +REQUIRES_DOCKER_ROOT=true + +# Service settings +CONTAINER_NAME=watchtower + +# Image settings +IMAGE_REGISTRY="docker.io" +IMAGE_REPO="containrrr/watchtower" +IMAGE_TAG="latest" diff --git a/watchtower/config/service.env b/watchtower/config/service.env index 7dc17c5..f331b3a 100644 --- a/watchtower/config/service.env +++ b/watchtower/config/service.env @@ -1,6 +1,9 @@ # Service settings specific to this server -# (can also override anything in the _basic.env file in the template to make it specific to this server) +# (can also override anything in the .template_info.env file in the template to make it specific to this server) # Interval in seconds between checks. # Default is 1800 seconds (30 minutes). -INTERVAL=1800 \ No newline at end of file +INTERVAL=1800 + +# Server Settings +SSH_USER="root"