Add dev convenience script for building containers

php/public/automatic_reload.js

@@ -9,7 +9,7 @@ window.addEventListener("load", function(event) {
 
         // set timeout for reload
         setTimeout(function(){
-        window.location.reload(true);
+        window.location.reload(1);
         }, 5000);
     } else {
         window.addEventListener("beforeunload", function() {

php/public/forms.js

@@ -36,11 +36,11 @@ function showPassword(id) {
       showError("Server error. Please check the mastercontainer logs for details. This page will reload after 10s automatically. Then you can check the mastercontainer logs.");
       // Reload after 10s since it is expected that the updated view is shown (e.g. after starting containers)
       setTimeout(function(){
-        window.location.reload(true);
+        window.location.reload(1);
       }, 10000);
     } else {
       // If the responose is not one of the above, we should reload to show the latest content
-      window.location.reload(true);
+      window.location.reload(1);
     }
   }
 
@@ -84,7 +84,7 @@ function showPassword(id) {
             document.getElementById('overlay-log')?.classList.add('visible');
             // Reload the page after the response was fully loaded into the iframe.
             document.querySelector('iframe[name="overlay-log"]').addEventListener('load', () => {
-                location.reload(true);
+                location.reload();
             });
         };
     }

php/templates/containers.twig

@@ -635,7 +635,7 @@
             {% endif %}
 
         {% if isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true %}
-            <script type="text/javascript" src="automatic_reload.js?v2"></script>
+            <script type="text/javascript" src="automatic_reload.js?v1"></script>
         {% else %}
             <script type="text/javascript" src="before-unload.js"></script>
         {% endif %}

php/templates/includes/aio-version.twig

@@ -1 +1 @@
-12.9.2
+12.9.1

php/templates/layout.twig

@@ -3,7 +3,7 @@
         <title>AIO</title>
         <link rel="stylesheet" href="style.css?v9" media="all" />
         <link rel="icon" href="img/favicon.png">
-        <script type="text/javascript" src="forms.js?v2"></script>
+        <script type="text/javascript" src="forms.js?v1"></script>
         <script type="text/javascript" src="toggle-dark-mode.js?v1"></script>
     </head>
 

scripts/build-containers.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+VARIANT="develop"
+CONTAINERS=()
+
+# Parse flags first
+while [[ $# -gt 0 && $1 == --* ]]; do
+  case $1 in
+    --variant)
+      VARIANT="$2"
+      shift 2
+      ;;
+    *)
+      echo "Unknown option: $1"
+      exit 1
+      ;;
+  esac
+done
+
+# Remaining arguments are containers
+CONTAINERS=("$@")
+
+if [ ${#CONTAINERS[@]} -eq 0 ]; then
+    echo "Usage: $0 [--variant develop|beta] <container1> [container2] [container3] ..."
+    echo "Example: $0 --variant beta apache mastercontainer"
+    exit 1
+fi
+
+# Change to project root
+cd "$(dirname "$0")/.." || exit 1
+
+for container in "${CONTAINERS[@]}"; do
+  if [[ $container == "mastercontainer" ]]; then
+    TAG="all-in-one"
+  else
+    TAG="aio-$container"
+  fi
+
+  if [[ $container == "mastercontainer" || $container == "nextcloud" ]]; then
+      CONTEXT="."
+  else
+      CONTEXT="Containers/$container"
+  fi
+
+  docker buildx build --file Containers/$container/Dockerfile --tag ghcr.io/nextcloud-releases/"$TAG":"$VARIANT" --load $CONTEXT
+done
+