Merge branch 'main' of https://gitea.jde.nz/j/dropshell

src/config.hpp

@@ -8,6 +8,5 @@ namespace dropshell {
 bool get_config_path(std::string& path);
 bool load_config();
 bool is_config_loaded();
-bool get_user_directory(std::string& path);
 
 } // namespace dropshell 

src/servers.cpp

@@ -1,3 +1,4 @@
+#include "init_user_directory.hpp"
 #include "dropshell.hpp"
 #include "server_env.hpp"
 #include <iostream>

src/templates.cpp

@@ -1,3 +1,4 @@
+#include "init_user_directory.hpp"
 #include "templates.hpp"
 #include "config.hpp"
 #include <filesystem>

templates/squashkiwi/_install.sh

@@ -32,8 +32,9 @@ if ! docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"; then
 fi
 echo "Successfully pulled the docker image from the registry"
 
-# start the container
+# remove and restart, as the env may have changed.
 _stop_container $CONTAINER_NAME
+_remove_container $CONTAINER_NAME
 create_and_start_container || die "Failed to start container ${CONTAINER_NAME}"
 
 echo "Installation complete"