RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-29 18:53:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

now using -f flag for docker build

Browse Source
This commit is contained in:
Loup-Garou911XD 2024-05-19 15:24:12 +05:30
parent 48d843d0dd
commit 18faf2a67e
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -222,7 +222,7 @@ pcommandbatch_speed_test: env
# Prebuilt binaries for various platforms. # Prebuilt binaries for various platforms.
docker-build: docker-build: assets-cmake
$(PCOMMAND) build_docker $(PCOMMAND) build_docker
docker-run: docker-run:

29
tools/batools/build.py
View File

@ -660,7 +660,9 @@ def _docker_build(
'build', 'build',
'-t', '-t',
image_name, image_name,
'-f',
dockerfile_dir, dockerfile_dir,
'.'
] ]
if bombsquad_version is not None: if bombsquad_version is not None:
build_cmd = build_cmd + [ build_cmd = build_cmd + [
@ -685,22 +687,19 @@ def docker_build() -> None:
import shutil import shutil
# todo: add option to toggle between prefab and cmake # todo: add option to toggle between prefab and cmake
shutil.copy('config/docker/Dockerfile', '.')
from batools import version from batools import version
version_num, build_num = version.get_current_version() version_num, build_num = version.get_current_version()
image_name = 'bombsquad_server' image_name = 'bombsquad_server'
try:
print( print(
f'Building docker image {image_name} version {version_num}:{build_num}' f'Building docker image {image_name}' +
) 'version {version_num}:{build_num}'
_docker_build( )
image_name, _docker_build(
'.', image_name,
version_num, os.getcwd()+'/config/docker/Dockerfile',
build_num, version_num,
) build_num,
except KeyboardInterrupt: )
print('Stopping docker image build.')
finally:
os.remove('Dockerfile')