From 9b5ae1c314dc4077d59329f26e9bfd8ca31295fd Mon Sep 17 00:00:00 2001
From: Daniel Stevens <Dan.R.Stevens@gmail.com>
Date: Mon, 22 Jul 2024 23:29:49 -0600
Subject: [PATCH] Split Docker image versions from `makefile`

These makes it easier to update separate images on separate branches, in parallel, and not encounter merge conflicts due to version number updates on adjacent lines.

This may also help in detecting which images need to be rebuilt, since we can watch for specific filenames, such as the Dockerfile or the associated version number file.
---
 docker/makefile               | 5 +----
 docker/nas2d-arch.version.mk  | 1 +
 docker/nas2d-clang.version.mk | 1 +
 docker/nas2d-gcc.version.mk   | 1 +
 docker/nas2d-mingw.version.mk | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 docker/nas2d-arch.version.mk
 create mode 100644 docker/nas2d-clang.version.mk
 create mode 100644 docker/nas2d-gcc.version.mk
 create mode 100644 docker/nas2d-mingw.version.mk

diff --git a/docker/makefile b/docker/makefile
index fb085701..623dd205 100644
--- 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
new file mode 100644
index 00000000..ab1b348b
--- /dev/null
+++ 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
new file mode 100644
index 00000000..8fa59705
--- /dev/null
+++ 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
new file mode 100644
index 00000000..14794c02
--- /dev/null
+++ 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
new file mode 100644
index 00000000..d95d0bc9
--- /dev/null
+++ b/docker/nas2d-mingw.version.mk
@@ -0,0 +1 @@
+ImageVersion_mingw := 1.10