wip #6693 @0.25

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index 250f6601d72c9a2a947cee7fc572f49f8504ef90..60bc916ec40a217451224c5f44bc90148191ad84 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -231,8 +231,8 @@ trait DockerWebContainer
 
         $docker = $www . '/.docker';
 
-        `mkdir -p $docker/$env;mv $dir/images $docker;mv $dir/config $docker;mv $dir/update $docker/$env;mv $dir/docker-compose.yml $docker/$env`;
-        file_put_contents($dir . 'update', '#!/bin/sh' . "\n" . "cd /docker/$name$dockerSuffix\nrm ./update\nln -sf ./www/.docker/$env/docker-compose.yml docker-compose.yml\nln -sf ./www/.docker/$env/update update\nchmod 755 ./www/.docker/update\n./www/.docker/update");
+        `mkdir -p $docker/$env;mv $dir/images $docker;mv $dir/config $docker;mv $dir/* $docker/$env`;
+        file_put_contents($dir . 'update', '#!/bin/sh' . "\n" . "cd /docker/$name$dockerSuffix\nrm ./update\nln -sf ./www/.docker/$env/docker-compose.yml docker-compose.yml\nln -sf ./www/.docker/$env/update update\nchmod 755 ./www/.docker/$env/update\n./www/.docker/$env/update");
         chmod($dir . 'update', 0755);
         Files::recursiveReplaceStringInDir($dir, $variables);
 

diff --git a/resources/tools/dockerwebcontainer/template/dockerterminal.bat b/resources/tools/dockerwebcontainer/template/dockerterminal.bat
new file mode 100644 (file)
index 0000000..0e45d3d
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/template/dockerterminal.bat
@@ -0,0 +1,3 @@
+@echo off
+cls
+ssh -t root@godzilla.cubedesigners.com 'docker exec -it -u $user $name /bin/bash'