defaults.sh

@@ -87,10 +87,8 @@ export LXD_CONFIG_PATH="$SS_ROOT_PATH/lxd"
 export LXD_UBUNTU_BASE_VERSION="jammy"
 export BASE_IMAGE_VM_NAME="ss-base-${LXD_UBUNTU_BASE_VERSION//./-}"
 export BASE_LXC_IMAGE="ubuntu/$LXD_UBUNTU_BASE_VERSION/cloud"
-WEEK_NUMBER=$(date +%U)
+export UBUNTU_BASE_IMAGE_NAME="ss-ubuntu-${LXD_UBUNTU_BASE_VERSION//./-}"
-export UBUNTU_BASE_IMAGE_NAME="ss-ubuntu-${LXD_UBUNTU_BASE_VERSION//./-}-$WEEK_NUMBER"
+export DOCKER_BASE_IMAGE_NAME="ss-docker-${LXD_UBUNTU_BASE_VERSION//./-}"
-
-export DOCKER_BASE_IMAGE_NAME="ss-docker-${LXD_UBUNTU_BASE_VERSION//./-}-$WEEK_NUMBER"
 
 export OTHER_SITES_LIST=
 export BTCPAY_ALT_NAMES=

deployment/destroy.sh

@@ -10,7 +10,7 @@ if lxc remote get-default | grep -q "local"; then
     exit 1
 fi
 
-echo "WARNING: This will DESTROY any existing VMs!"
+echo "WARNING: This will DESTROY any existing VMs! Use the --purge flag to delete ALL Sovereign Stack LXD resources."
 
 RESPONSE=
 read -r -p "Are you sure you want to continue (y/n):  ": RESPONSE

deployment/show.sh

@@ -26,13 +26,14 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
     echo
     echo
     echo "Project: $PROJECT_NAME"
-    echo "----------------------------------------------------------"
+    echo "----------------------"
     if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
         if lxc project list | grep -q "$PROJECT_NAME"; then
             lxc project switch "$PROJECT_NAME"
         fi
     fi
 
+    echo
     echo "  Networks:"
     lxc network list
     echo
@@ -41,5 +42,6 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
     echo
     echo "  Instances (VMs):"
     lxc list
-    echo "----------------------------------------------------------"
+    echo
+
 done