Merge pull request #1171 from lairworks/renameDockerBuildImages

Rename Docker build images

.github/workflows/build.yml

@@ -64,7 +64,7 @@ jobs:
       fail-fast: false
       matrix:
         image:
-        - "nas2d-arch:1.5"
+        - "build-env-nas2d-arch:1.5"
     runs-on: ubuntu-latest
     container:
       image: "ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}"

.github/workflows/dockerBuild.yml → .github/workflows/buildDockerBuildEnv.yml

@@ -1,4 +1,4 @@
-name: Docker Build
+name: Build Docker Build Env
 
 on:
   push:
@@ -8,8 +8,8 @@ on:
     branches-ignore:
       - 'main'
     paths:
-      - '.github/workflows/dockerBuild.yml'
-      - 'docker/*'
+      - '.github/workflows/buildDockerBuildEnv.yml'
+      - 'dockerBuildEnv/*'
   workflow_dispatch:
 
 jobs:
@@ -20,8 +20,6 @@ jobs:
       matrix:
         platform:
         - 'arch'
-    env:
-      DockerRepository: ghcr.io/${{ github.repository_owner }}
 
     steps:
       - uses: actions/checkout@v4
@@ -35,16 +33,16 @@ jobs:
         id: diff
         run: |
           set +e
-          git diff --exit-code --no-patch origin/main docker/nas2d-${{ matrix.platform }}.* ; echo "modified=$?" >> $GITHUB_OUTPUT
+          git diff --exit-code --no-patch origin/main dockerBuildEnv/makefile dockerBuildEnv/nas2d-${{ matrix.platform }}.* ; echo "modified=$?" >> $GITHUB_OUTPUT
 
       - name: Docker build
         if: ${{ fromJSON(steps.diff.outputs.modified) }}
-        run: make -C docker build-image-${{ matrix.platform }}
+        run: make build-image-${{ matrix.platform }}
 
       - name: Docker login
         if: ${{ fromJSON(steps.diff.outputs.modified) }}
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
 
       - name: Docker push
         if: ${{ fromJSON(steps.diff.outputs.modified) }}
-        run: make -C docker push-image-${{ matrix.platform }}
+        run: make push-image-${{ matrix.platform }}

docker/makefile → dockerBuildEnv/makefile

@@ -3,19 +3,20 @@
 # Capture top level folder before any Makefile includes
 # Note: MAKEFILE_LIST's last entry is the last processed Makefile.
 #       That should be the current Makefile, assuming no includes
-DockerFolder := $(abspath $(dir $(lastword ${MAKEFILE_LIST})))
-TopLevelFolder := $(abspath $(DockerFolder)/..)
+DockerBuildEnvFolder := $(abspath $(dir $(lastword ${MAKEFILE_LIST})))
+TopLevelFolder := $(abspath $(DockerBuildEnvFolder)/..)
 
 DockerRunFlags := --volume ${TopLevelFolder}:/code --workdir=/code --rm --tty
 DockerUserFlags = --user="$(shell id --user):$(shell id --group)"
-DockerRepository ?= outpostuniverse
+DockerRepository ?= ghcr.io/lairworks
 
-include $(wildcard $(DockerFolder)/nas2d-*.version.mk)
+include $(wildcard $(DockerBuildEnvFolder)/nas2d-*.version.mk)
 
-DockerFileName = ${DockerFolder}/nas2d-$*.Dockerfile
+DockerFileName = ${DockerBuildEnvFolder}/nas2d-$*.Dockerfile
 
-DockerImageName = ${DockerRepository}/nas2d-$*:${ImageVersion_$*}
-DockerImageNameLatest = ${DockerRepository}/nas2d-$*:latest
+DockerImageName = ${DockerRepository}/build-env-nas2d-$*
+DockerImageNameTagged = ${DockerImageName}:${ImageVersion_$*}
+DockerImageNameLatest = ${DockerImageName}:latest
 
 DockerBuildRules := build-image-gcc build-image-clang build-image-mingw build-image-arch
 DockerPushRules := push-image-gcc push-image-clang push-image-mingw push-image-arch
@@ -26,17 +27,17 @@ DockerDebugRootRules := root-debug-image-gcc root-debug-image-clang root-debug-i
 .PHONY: ${DockerBuildRules} ${DockerPushRules} ${DockerRunRules} ${DockerDebugRules} ${DockerDebugRootRules}
 
 ${DockerBuildRules}: build-image-%:
-	docker build ${DockerFolder}/ --file ${DockerFileName} --tag ${DockerImageName} --tag ${DockerImageNameLatest}
+	docker build ${DockerBuildEnvFolder}/ --file ${DockerFileName} --tag ${DockerImageNameTagged} --tag ${DockerImageNameLatest}
 
 ${DockerPushRules}: push-image-%:
-	docker push ${DockerImageName}
+	docker push ${DockerImageNameTagged}
 	docker push ${DockerImageNameLatest}
 
 ${DockerRunRules}: run-image-%:
-	docker run ${DockerRunFlags} ${DockerUserFlags} ${DockerImageName}
+	docker run ${DockerRunFlags} ${DockerUserFlags} ${DockerImageNameTagged}
 
 ${DockerDebugRules}: debug-image-%:
-	docker run ${DockerRunFlags} --interactive ${DockerUserFlags} ${DockerImageName} bash
+	docker run ${DockerRunFlags} --interactive ${DockerUserFlags} ${DockerImageNameTagged} bash
 
 ${DockerDebugRootRules}: root-debug-image-%:
-	docker run ${DockerRunFlags} --interactive ${DockerImageName} bash
+	docker run ${DockerRunFlags} --interactive ${DockerImageNameTagged} bash

makefile

@@ -234,7 +234,7 @@ install-dependencies-darwin:
 
 #### Docker related build rules ####
 
-include docker/makefile
+include dockerBuildEnv/makefile
 
 #### CircleCI related build rules ####