From 10b04254d11eadb06138bcf51a893ae2483ebc2c Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 30 Jan 2024 12:53:54 +0100 Subject: [PATCH] wip #6693 @0.25 --- .../Controllers/Admin/Operations/Tools/DockerWebContainer.php | 4 ++-- .../tools/dockerwebcontainer/template/dockerterminal.bat | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 resources/tools/dockerwebcontainer/template/dockerterminal.bat diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php index 250f6601d..60bc916ec 100644 --- 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 index 000000000..0e45d3d04 --- /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' -- 2.39.5