wip #7168 @0.5

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index c6278b908d7c8b7d738c5be6eab7506b0b7a444c..537677abe581f9a4f2c8858ed4317db3ce675e01 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -250,6 +250,15 @@ trait DockerWebContainer
                     __('Mot de passe') => $variables['$sshpassword'],
                 ]);
         }
+        if ($s3) {
+            $infos = array_merge($infos,
+                [
+                    __('Hôte du serveur S3') => $variables['$name'] . '-s3',
+                    __('Interface d\'administration de S3') => 'https://console.s3.' . $variables['$domain'] . '/',
+                    __('Utilisateur du serveur S3') => 'root',
+                    __('Mot de passe du serveur S3') => $variables['$s3password'],
+                ]);
+        }
         foreach ($infos as $k => $v) {
             $notification .= '* ' . $k . ' : ' . $v . "\n";
         }

diff --git a/resources/tools/dockerwebcontainer/s3 b/resources/tools/dockerwebcontainer/s3
index 2c3857c9b8bf0d52461873d3bee18c6dba003ec8..b15f2ab3fb50f4356c29502d7d8b1d1629669a8e 100644 (file)
--- a/resources/tools/dockerwebcontainer/s3
+++ b/resources/tools/dockerwebcontainer/s3
@@ -2,16 +2,14 @@
     image: 'minio/minio:latest'
     container_name: $name-s3
     environment:
-      VIRTUAL_HOST: s3.$domain
-      VIRTUAL_PORT: 9000
       VIRTUAL_HOST_MULTIPORTS: |-
         s3.$domain:
           "/":
             port: 9000
-        s3.$domain:
-          "/console":
+        console.s3.$domain:
+          "/":
             port: 8900
-      LETSENCRYPT_HOST: s3.$domain
+      LETSENCRYPT_HOST: s3.$domain,console.s3.$domain
       MINIO_ROOT_USER: root
       MINIO_ROOT_PASSWORD: $s3password
     volumes: