From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 30 May 2022 13:36:27 +0000 (+0200)
Subject: wait #5294 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e0e41f918ffab72065b83a45d98c3f4643dd60fb;p=fluidbook-toolbox.git

wait #5294 @2
---

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index 757594ca0..329c88daf 100644
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -41,8 +41,8 @@ trait DockerWebContainer
         $request = request();
         $name = Str::slug($request->get('name', 'containername'));
         $variables = ['$name' => $name,
-            '$port' => rand(10000, 60000),
             '$portadminer' => rand(10000, 60000),
+            '$port' => rand(10000, 60000),
             '$domain' => $request->get('domain', ''),
             '$dbpassword' => Str::random(16),
             '$phpfpmimage' => 'php-fpm'
diff --git a/resources/tools/dockerwebcontainer/base b/resources/tools/dockerwebcontainer/base
index 8d0f2c77f..b9cedb3ba 100644
--- a/resources/tools/dockerwebcontainer/base
+++ b/resources/tools/dockerwebcontainer/base
@@ -14,4 +14,5 @@ services:
             LETSENCRYPT_HOST: $domain
         networks:
             - $name
+        restart: unless-stopped
 
diff --git a/resources/tools/dockerwebcontainer/mysql b/resources/tools/dockerwebcontainer/mysql
index f372f992c..14ea73e7e 100644
--- a/resources/tools/dockerwebcontainer/mysql
+++ b/resources/tools/dockerwebcontainer/mysql
@@ -1,7 +1,7 @@
     adminer:
       image: adminer:latest
       container_name: $name-adminer
-      restart: always
+      restart: unless-stopped
       ports:
         - $portadminer:8080
       environment:
@@ -13,6 +13,7 @@
     mariadb:
         container_name: $name-mariadb
         image: 'mariadb'
+        restart: unless-stopped
         environment:
           MARIADB_ROOT_PASSWORD: $dbpassword
           MARIADB_DATABASE: $name
diff --git a/resources/tools/dockerwebcontainer/php b/resources/tools/dockerwebcontainer/php
index 608f834e6..6d887acde 100644
--- a/resources/tools/dockerwebcontainer/php
+++ b/resources/tools/dockerwebcontainer/php
@@ -7,3 +7,4 @@
             - '/docker/$name/phpdocker/$phpfpmimage/php-ini-overrides.ini:/etc/php/$phpversion/fpm/conf.d/99-overrides.ini'
         networks:
           - $name
+        restart: unless-stopped