mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-19 21:37:57 +08:00
now using -f flag for docker build
This commit is contained in:
parent
48d843d0dd
commit
18faf2a67e
2
Makefile
2
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:
|
||||
|
||||
@ -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,
|
||||
)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user