From 74614553d2bee3a1d7a9d9331089e431889b491c Mon Sep 17 00:00:00 2001 From: Steffen Bollmann Date: Mon, 9 Sep 2024 13:45:52 +1000 Subject: [PATCH] simplify --- recipes/build.py | 8 +++----- recipes/build.sh | 7 ------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/recipes/build.py b/recipes/build.py index 8ae80f2..e142fc6 100644 --- a/recipes/build.py +++ b/recipes/build.py @@ -6,11 +6,9 @@ import os # Validate JSON file against OpenRecon schema and write Dockerfile -toolName = os.getenv('toolName') - -jsonFilePath = toolName + '/OpenReconLabel.json' -schemaFilePath = 'OpenReconSchema_1.1.0.json' -dockerfilePath = toolName + '/OpenRecon.dockerfile' +jsonFilePath = 'OpenReconLabel.json' +schemaFilePath = '../OpenReconSchema_1.1.0.json' +dockerfilePath = '/OpenRecon.dockerfile' baseDockerImage = os.getenv('baseDockerImage') def validateJson(jsonFilePath, schemaFilePath): diff --git a/recipes/build.sh b/recipes/build.sh index 01b4437..838411e 100644 --- a/recipes/build.sh +++ b/recipes/build.sh @@ -47,12 +47,5 @@ source params.sh echo "baseDockerImage: $baseDockerImage" -current_dir=$(pwd) -export toolName=$(basename "$current_dir") - -echo "toolName: $toolName" - - # build zip file -cd .. python3 build.py