Yay

templates/watchtower/_common.sh

@@ -45,21 +45,26 @@ grey_end() {
 }
 
 create_and_start_container() {
-    if _is_container_exists $CONTAINER_NAME; then
-        _is_container_running $CONTAINER_NAME && return 0
-        _start_container $CONTAINER_NAME
+    local run_cmd="$1"
+    local container_name="$2"
+
+    if _is_container_exists $container_name; then
+        if _is_container_running $container_name; then
+            return 0
+        fi
+        _start_container $container_name
     else
         grey_start
-        $1
+        $run_cmd
         grey_end
     fi
 
-    if ! _is_container_running $CONTAINER_NAME; then
-        die "Container ${CONTAINER_NAME} failed to start"
+    if ! _is_container_running $container_name; then
+        die "Container ${container_name} failed to start"
     fi
 
-    ID=$(_get_container_id $CONTAINER_NAME)
-    echo "Container ${CONTAINER_NAME} is running with ID ${ID}"
+    ID=$(_get_container_id $container_name)
+    echo "Container ${container_name} is running with ID ${ID}"
 }
 
 function create_folder() {
@@ -152,3 +157,11 @@ _get_container_logs() {
     docker logs $1
 }
 
+check_required_env_vars() {
+    local required_vars=("$@")
+    for var in "${required_vars[@]}"; do
+        if [ -z "${!var}" ]; then
+            die "Required environment variable $var is not set in your service.env file"
+        fi
+    done
+}