From 8bed0a4b10e11338801584d285ef5ccd833e6935 Mon Sep 17 00:00:00 2001 From: mantaohuang Date: Sun, 20 Dec 2020 13:09:32 -0500 Subject: [PATCH] put instance config file to config folder --- docker-entrypoint.sh | 2 +- docker/docker-compose.yml | 1 + test.py | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c3b59eb..66eba2d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -8,4 +8,4 @@ cd /mop python profile_scanner.py -c $CONFIG_FOLDER -a $AUTH_FILE # run main script -python -u test.py -s /tmp +python -u test.py -s /tmp -l $INSTANCE_CONFIG diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0aa03c5..3113a2d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -15,4 +15,5 @@ services: - net_admin environment: CONFIG_FOLDER: /config + INSTANCE_CONFIG: /config/instances.json AUTH_FILE: /config/fast.txt diff --git a/test.py b/test.py index 495610b..28c7717 100644 --- a/test.py +++ b/test.py @@ -13,13 +13,16 @@ ap.add_argument("-i", "--interface", required=False, help="interface (default: eth0)", default="eth0") ap.add_argument("-s", "--session_folder", required=True, help="path to the session folder") +ap.add_argument("-l", "--load_instance_config", required=False, + help="instance config file (default: /config/instance.json)", default="/config/instance.json") args = vars(ap.parse_args()) session_folder = args["session_folder"] interface = args["interface"] om = OManager(session_folder, interface) root = os.path.dirname(__file__) -instance_config_fp = os.path.join(root, "config/instances.json") +instance_config_fp = args["load_instance_config"] + try: instance_config = json.load(open(instance_config_fp, "r")) @@ -128,7 +131,7 @@ class ClearCacheInstatnceHandler(tornado.web.RequestHandler): class SaveInstanceHandler(tornado.web.RequestHandler): def get(self): instances = om.serialize_instance_config() - with open(os.path.join(root, instance_config_fp), "w") as f: + with open(instance_config_fp, "w") as f: f.write(json.dumps(instances)) self.write("OK")