From 18faf2a67e026c2610e33eb53d95f30cf8dda5ce Mon Sep 17 00:00:00 2001
From: Loup-Garou911XD <Loup-Garou911XD@users.noreply.github.com>
Date: Sun, 19 May 2024 15:24:12 +0530
Subject: [PATCH] now using -f flag for docker build

---
 Makefile               |  2 +-
 tools/batools/build.py | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index eec952de..68df7215 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,7 @@ pcommandbatch_speed_test: env
 
 # Prebuilt binaries for various platforms.
 
-docker-build:
+docker-build: assets-cmake
 	$(PCOMMAND) build_docker
 
 docker-run:
diff --git a/tools/batools/build.py b/tools/batools/build.py
index 329f69f5..24a711fc 100644
--- a/tools/batools/build.py
+++ b/tools/batools/build.py
@@ -660,7 +660,9 @@ def _docker_build(
         'build',
         '-t',
         image_name,
+        '-f',
         dockerfile_dir,
+        '.'
     ]
     if bombsquad_version is not None:
         build_cmd = build_cmd + [
@@ -685,22 +687,19 @@ def docker_build() -> None:
     import shutil
 
     # todo: add option to toggle between prefab and cmake
-    shutil.copy('config/docker/Dockerfile', '.')
     from batools import version
 
     version_num, build_num = version.get_current_version()
     image_name = 'bombsquad_server'
-    try:
-        print(
-            f'Building docker image {image_name} version {version_num}:{build_num}'
-        )
-        _docker_build(
-            image_name,
-            '.',
-            version_num,
-            build_num,
-        )
-    except KeyboardInterrupt:
-        print('Stopping docker image build.')
-    finally:
-        os.remove('Dockerfile')
+    
+    print(
+        f'Building docker image {image_name}' +
+        'version {version_num}:{build_num}'
+    )
+    _docker_build(
+        image_name,
+        os.getcwd()+'/config/docker/Dockerfile',
+        version_num,
+        build_num,
+    )
+