agp8x
/
docker-autostart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add dry-run option and log level option

master
agp8x 2020-06-22 10:23:11 +02:00
parent 1a61503eb5
commit cba5d02f82
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discover.py
View File

@ -72,4 +72,4 @@ if __name__ == "__main__":
else: else:
import start import start
for service in autostarts: for service in autostarts:
start.change_service(service, args.action, pre_cmd=args.pre, post_cmd=args.post) start.change_service(service, args.action, pre_cmd=args.pre, post_cmd=args.post, dry_run=args.dry_run)

2
docker-autostart.openrc
View File

@ -9,11 +9,9 @@ depend(){
} }
start(){ start(){
#python3 /opt/docker/docker-autostart/discover.py /opt/docker/ /opt/docker/services/
$command $command_args $command $command_args
} }
stop(){ stop(){
#python3 -a down /opt/docker/docker-autostart/discover.py /opt/docker/ /opt/docker/services/
$command $command_args -a down $command $command_args -a down
} }

26
start.py
View File

@ -7,26 +7,30 @@ import sys
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def run(cmd, kwargs={}, dry_run=False):
if dry_run:
log.info(f"tried to run: `{cmd}, {kwargs}`, dry_run=True", extra={"path": "/dry/run/", "cmd": cmd, "returncode": -99})
return subprocess.CompletedProcess(cmd, -99)
return subprocess.run(cmd, **kwargs)
def change_service(path, action, pre_cmd=None, post_cmd=None): def change_service(path, action, pre_cmd=None, post_cmd=None, dry_run=False):
cmd = ["docker-compose"] + action.split() cmd = ["docker-compose"] + action.split()
if path.endswith("/docker-compose.yml"): if path.endswith("/docker-compose.yml"):
path = path[:-len("/docker-compose.yml")] path = path[:-len("/docker-compose.yml")]
args = { args = {
"args": cmd,
"cwd": path, "cwd": path,
} }
if post_cmd: if post_cmd:
args["capture_output"] = True args["capture_output"] = True
args["text"] = True args["text"] = True
if pre_cmd: if pre_cmd:
subprocess.run(pre_cmd.format(path=path, cmd=cmd, step="pre").split()) run(pre_cmd.format(path=path, cmd=cmd, step="pre").split(), dry_run=dry_run)
r = subprocess.run(**args) r = run(cmd, args, dry_run=dry_run)
log.info(f"processed {path}", extra={"path": path, "cmd": cmd, "returncode": r.returncode}) log.info(f"processed {path} (status {r.returncode})", extra={"path": path, "cmd": cmd, "returncode": r.returncode})
if post_cmd: if post_cmd:
if r.stdout: print(r.stdout) if r.stdout: print(r.stdout)
if r.stderr: print(r.stderr, file=sys.stderr) if r.stderr: print(r.stderr, file=sys.stderr)
subprocess.run(post_cmd.format(path=path, cmd=cmd, step="post", returncode=r.returncode, stdout=r.stdout, stderr=r.stderr).split()) run(post_cmd.format(path=path, cmd=cmd, step="post", returncode=r.returncode, stdout=r.stdout, stderr=r.stderr).split(), dry_run=dry_run)
print() print()
@ -50,23 +54,25 @@ def get_loader(config_file):
return load_stdin return load_stdin
return load_raw return load_raw
def apply(config_file, action, pre=None, post=None): def apply(config_file, action, pre=None, post=None, dry_run=False):
load = get_loader(config_file) load = get_loader(config_file)
for path in load(config_file): for path in load(config_file):
change_service(path, action, pre_cmd=pre, post_cmd=post) change_service(path, action, pre_cmd=pre, post_cmd=post, dry_run=dry_run)
def base_args(desc): def base_args(desc):
parser = argparse.ArgumentParser(description=desc) parser = argparse.ArgumentParser(description=desc)
parser.add_argument("--action", "-a", default="up -d", help="docker-compose action to apply, default: up -d") parser.add_argument("--action", "-a", default="up -d", help="docker-compose action to apply, default: up -d")
parser.add_argument("--pre", "-s", help="pre-exec: command to run before each action") parser.add_argument("--pre", "-s", help="pre-exec: command to run before each action")
parser.add_argument("--post", "-e", help="post-exec: command to run after each action") parser.add_argument("--post", "-e", help="post-exec: command to run after each action")
parser.add_argument("--dry-run", "-d", action="store_true", help="dry run: only print commands")
parser.add_argument("--log", default="INFO", choices=["INFO","DEBUG","WARNING"], help="log level (default: %(default)s)")
return parser return parser
if __name__ == "__main__": if __name__ == "__main__":
logging.basicConfig(format="%(message)s (status %(returncode)s)", level=logging.INFO)
parser = base_args("Docker-compose Autostart") parser = base_args("Docker-compose Autostart")
parser.add_argument("config_file", default="-", help="json file, plain text list or - for stdin") parser.add_argument("config_file", default="-", help="json file, plain text list or - for stdin")
args = parser.parse_args() args = parser.parse_args()
logging.basicConfig(format="%(message)s", level=getattr(logging, args.log))
apply(args.config_file, args.action, pre=args.pre, post=args.post) apply(args.config_file, args.action, pre=args.pre, post=args.post, dry_run=args.dry_run)