diff --git a/cli/__pycache__/controller.cpython-36.pyc b/cli/__pycache__/controller.cpython-36.pyc index 99497b29..9d4876ca 100644 Binary files a/cli/__pycache__/controller.cpython-36.pyc and b/cli/__pycache__/controller.cpython-36.pyc differ diff --git a/cli/controller.py b/cli/controller.py index bc3cc77a..5b9be3e4 100644 --- a/cli/controller.py +++ b/cli/controller.py @@ -32,23 +32,26 @@ class Create: def downRepo(self): '''download repository''' - cmd = "git clone --depth=1 " + model.SmoothUrl.res(github_url) + "/websoft9/docker-" + self.app_name + " " + self.folder + geturl = model.SmoothUrl() + gitop = model.GitOp() + + cmd = "git clone --depth=1 " + geturl.res(github_url) + "/websoft9/docker-" + self.app_name + " " + self.folder if os.path.exists("./"+self.folder): print(os.path.abspath(self.folder)+" folder already exists") sys.exit(0) else: - GitOp.gitClone(cmd) + gitop.gitClone(cmd) def setEnv(self): '''set the usable port for application''' - fileop=FileOp() - print(fileop.fileToJson('./joomla/.env_all')) + fileop=model.FileOp() + print(fileop.fileToJson('./drupal/.env')) pass def upRepo(self): '''docker-compose up repository''' - cmd = "docker-compose -f docker-compose-production.yml --env-file .env_all up -d" + cmd = "docker-compose up -d" print(cmd) os.chdir(self.folder) os.system(cmd) diff --git a/cli/joomla b/cli/joomla deleted file mode 160000 index 93735135..00000000 --- a/cli/joomla +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 93735135cf4529fc7830446bb6604f7c15daae2f