From 5e422f0d0f49343a9cef63d6e5d5c50e5b39b47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andra=C5=BE=20Jelenc?= Date: Tue, 20 Oct 2020 10:09:21 +0200 Subject: [PATCH] Fixing docker --- Dockerfile | 2 +- docker-entrypoint.sh | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab04167..4b37b93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apk update; \ py-pip \ bash; \ pip3 install -r requirements.txt; \ - apk del py-pip python3-dev; \ + apk del python3-dev; \ rm -rf /var/cache/apk/* ; \ rm -rf Atomic_Threat_Coverage; CMD /app/docker-entrypoint.sh \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 4fe4848..00102ff 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,9 +1,8 @@ -cd scripts echo "[*] Setting up confluence" -python3 init_confluence.py +python3 main.py -C --init echo "[*] Setting up markdown" -python3 init_markdown.py +python3 main.py -M --init echo "[*] Pushing data to confluence" python3 main.py -C -A @@ -12,13 +11,13 @@ echo "[*] Pushing data to markdown" python3 main.py -M -A echo "[*] Creating analytics.csv and pivoting.csv" -python3 yamls2csv.py +python3 main.py -CSV echo "[*] Creating ATT&CK Navigator profile" -python3 attack_navigator_export.py +python3 main.py -TD-NAV echo "[*] Creating ATT&CK Navigator profile" -python3 attack_navigator_per_customer_export.py +python3 main.py -TD-NAV-CU echo "[*] Creating markdown repository and pushing data" python3 main.py --markdown --auto --init @@ -27,7 +26,7 @@ echo "[*] Creating confluence repository and pushing data" python3 main.py --confluence --auto --init echo "[*] Creating elastic index" -python3 es_index_export.py +python3 main.py -ES echo "[*] Creating visualizations.." python3 main.py -V