dev

command/Start.php

@@ -103,7 +103,7 @@ class Start
             if(!file_exists($directory . '/config'))  mkdir($directory . '/config', 0777, true); //
             // yml 文件
             $template = file_get_contents(ROOT_DIR . '/dockerfile/template.yml');
-            $template = str_replace('<containerName>', $name, $template);
+            $template = str_replace('containers/<containerName>', $name, $template);
             $template = str_replace('<ip>', $ipv4, $template);
             $template = str_replace('<proginn-branch>', "dev", $template);
             $template = str_replace('<rooter-branch>', "dev", $template);

shell/container-up.sh

@@ -22,10 +22,10 @@ ln -f -s /code/config/php7/web/pool.test.conf /etc/php/7.2/fpm/pool.d/www.conf
 # sync cron
 cp /data/docker/config/crontab/container-code-up /etc/crontab
 
-#cp -Rf /data/docker/config/id_rsa ~/.ssh/
-#cp -Rf /data/docker/config/id_rsa.pub ~/.ssh/
-#chmod 700 ~/.ssh/id_rsa
-#chmod 700 ~/.ssh/id_rsa.pub
+cp -Rf /data/docker/config/id_rsa ~/.ssh/
+cp -Rf /data/docker/config/id_rsa.pub ~/.ssh/
+chmod 700 ~/.ssh/id_rsa
+chmod 700 ~/.ssh/id_rsa.pub
 
 # 更新代码
 chown -R www-data:www-data /code