Merge pull request #1165 from lairworks/splitDockerImageVersions

Split Docker image versions from `makefile`
lairworks · Aug 12, 2024 · adafb14 · adafb14
2 parents f591467 + 9b5ae1c
commit adafb14
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/docker/makefile b/docker/makefile
@@ -10,10 +10,7 @@ DockerRunFlags := --volume ${TopLevelFolder}:/code --workdir=/code --rm --tty
 DockerUserFlags = --user="$(shell id --user):$(shell id --group)"
 DockerRepository := outpostuniverse
 
-ImageVersion_gcc := 1.5
-ImageVersion_clang := 1.4
-ImageVersion_mingw := 1.10
-ImageVersion_arch := 1.4
+include $(wildcard $(DockerFolder)/nas2d-*.version.mk)
 
 DockerFileName = ${DockerFolder}/nas2d-$*.Dockerfile
 

diff --git a/docker/nas2d-arch.version.mk b/docker/nas2d-arch.version.mk
@@ -0,0 +1 @@
+ImageVersion_arch := 1.4
diff --git a/docker/nas2d-clang.version.mk b/docker/nas2d-clang.version.mk
@@ -0,0 +1 @@
+ImageVersion_clang := 1.4
diff --git a/docker/nas2d-gcc.version.mk b/docker/nas2d-gcc.version.mk
@@ -0,0 +1 @@
+ImageVersion_gcc := 1.5
diff --git a/docker/nas2d-mingw.version.mk b/docker/nas2d-mingw.version.mk
@@ -0,0 +1 @@
+ImageVersion_mingw := 1.10