From 8fd5567ed22b323021dbb149390a0cb1a14724d2 Mon Sep 17 00:00:00 2001 From: faulty Date: Mon, 12 Dec 2022 23:14:31 +0100 Subject: [PATCH 1/2] development database server --- .gitmodules | 3 +++ docker-compose.development.yml | 13 +++++++++++++ env | 1 + 3 files changed, 17 insertions(+) create mode 100644 .gitmodules create mode 100644 docker-compose.development.yml create mode 160000 env diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..271386f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "env"] + path = env + url = git@git.faulty.nl:infra/env diff --git a/docker-compose.development.yml b/docker-compose.development.yml new file mode 100644 index 0000000..5b58b26 --- /dev/null +++ b/docker-compose.development.yml @@ -0,0 +1,13 @@ +version: '2.2' + +services: + mysql: + image: mariadb:10.3 + container_name: mysql + restart: always + env_file: + - ./env/dev.database.env + volumes: + - /srv/devdb/data:/var/lib/mysql + ports: + - 3306:3306 diff --git a/env b/env new file mode 160000 index 0000000..ef2b833 --- /dev/null +++ b/env @@ -0,0 +1 @@ +Subproject commit ef2b833d837a4b171ca36713b9b13bc6fe957a3e From e10f10183f983c80ac1c4df6ac474f7046d35d20 Mon Sep 17 00:00:00 2001 From: faulty Date: Mon, 12 Dec 2022 23:25:46 +0100 Subject: [PATCH 2/2] manager update --- utils/manager/main.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/utils/manager/main.py b/utils/manager/main.py index 605d360..7882cc5 100644 --- a/utils/manager/main.py +++ b/utils/manager/main.py @@ -30,9 +30,9 @@ def main(): ap.add_argument("--savefile", help="The savefile to use", default=os.path.expanduser("~/.local/faulty/neo.save")) - ap.add_argument("--del-savefile", help="Delete the savefile", + ap.add_argument("--del-savefile", "--rm-save", help="Delete the savefile", action="store_true") - ap.add_argument("--ignore-savefile", help="Ignore the savefile", + ap.add_argument("--ignore-savefile", "--no-load", help="Ignore the savefile", action="store_true") # -x, --exclude: e.g. -x this -x that @@ -75,11 +75,21 @@ def main(): if args.save: savefile["files"] = files - return def handle_aliases(fnlist: dict, name: str): return fnlist.get(name, lambda: print("does not exist")) + def dump_data(): + print(f"savefile: {args.savefile}") + print(f"del_savefile: {args.del_savefile}") + print(f"ignore_savefile: {args.ignore_savefile}") + print(f"exclude: {args.exclude}") + print(f"include: {args.include}") + print(f"save: {args.save}") + print(f"action: {args.action}") + print(f"args: {args.args}") + print(f"files: {files}") + fnlist = { "up": lambda: dc(f"up -d {' '.join(args.args)}"), "upr": lambda: dc(f"up -d --build {' '.join(args.args)}"), @@ -87,6 +97,7 @@ def main(): "default": lambda: dc(f"{' '.join(args.args)}"), "setup": lambda: setup_handler(args.args[0]), "delete-project-files": lambda: os.system(f"sudo rm -rf /srv/{args.args[0]}"), + "_dump": lambda: dump_data(), "dpf": lambda: handle_aliases(fnlist, "delete-project-files")() }