meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

Use execute

Browse source
This commit is contained in:
erik 2023-07-12 15:50:33 +02:00
parent 1cc7221c44
commit d2bc3cd9f3
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/python/ddadevops/infrastructure/infrastructure.py
View file

@ -53,37 +53,37 @@ class ImageApi:
self.execution_api = ExecutionApi() self.execution_api = ExecutionApi()
def image(self, name: str, path: Path): def image(self, name: str, path: Path):
self.execution_api.run_handled( self.execution_api.execute(
f"docker build -t {name} --file {path}/image/Dockerfile {path}/image" f"docker build -t {name} --file {path}/image/Dockerfile {path}/image"
) )
def drun(self, name: str): def drun(self, name: str):
self.execution_api.run_handled( self.execution_api.execute(
f'docker run -it --entrypoint="" {name} /bin/bash' f'docker run -it --entrypoint="" {name} /bin/bash'
) )
def dockerhub_login(self, username: str, password: str): def dockerhub_login(self, username: str, password: str):
self.execution_api.run_handled( self.execution_api.execute(
f"docker login --username {username} --password {password}" f"docker login --username {username} --password {password}"
) )
def dockerhub_publish(self, name: str, username: str, tag=None): def dockerhub_publish(self, name: str, username: str, tag=None):
if tag is not None: if tag is not None:
self.execution_api.run_handled( self.execution_api.execute(
f"docker tag {name} {username}/{name}:{tag}" f"docker tag {name} {username}/{name}:{tag}"
) )
self.execution_api.run_handled( self.execution_api.execute(
f"docker push {username}/{name}:{tag}" f"docker push {username}/{name}:{tag}"
) )
self.execution_api.run_handled( self.execution_api.execute(
f"docker tag {name} {username}/{name}:latest" f"docker tag {name} {username}/{name}:latest"
) )
self.execution_api.run_handled( self.execution_api.execute(
f"docker push {username}/{name}:latest" f"docker push {username}/{name}:latest"
) )
def test(self, name: str, path: Path): def test(self, name: str, path: Path):
self.execution_api.run_handled( self.execution_api.execute(
f"docker build -t {name} -test --file {path}/test/Dockerfile {path}/test" f"docker build -t {name} -test --file {path}/test/Dockerfile {path}/test"
) )
@ -111,18 +111,6 @@ class ExecutionApi:
process.stdout.close() process.stdout.close()
process.wait() process.wait()
def run_handled(self, command: str, shell=True, check=True):
try:
run(
command,
shell=shell,
check=check,
capture_output=True,
text=True)
except CalledProcessError as exc:
print("Command failed with code: ", exc.returncode, " and message:", exc.stderr)
raise CalledProcessError
class EnvironmentApi: class EnvironmentApi:
def get(self, key): def get(self, key):