Skip to content

Commit

Permalink
Split Docker image versions from makefile
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
DanRStevens committed Jul 23, 2024
1 parent f591467 commit 9b5ae1c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
5 changes: 1 addition & 4 deletions docker/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions docker/nas2d-arch.version.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ImageVersion_arch := 1.4
1 change: 1 addition & 0 deletions docker/nas2d-clang.version.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ImageVersion_clang := 1.4
1 change: 1 addition & 0 deletions docker/nas2d-gcc.version.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ImageVersion_gcc := 1.5
1 change: 1 addition & 0 deletions docker/nas2d-mingw.version.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ImageVersion_mingw := 1.10

0 comments on commit 9b5ae1c

Please sign in to comment.