Merge pull request #1180 from lairworks/improveDockerMakefile

Improve docker `makefile`

.github/workflows/buildDockerBuildEnv.yml

@@ -37,7 +37,7 @@ jobs:
         id: diff
         run: |
           set +e
-          git diff --exit-code --no-patch "origin/${defaultBranch}" dockerBuildEnv/makefile dockerBuildEnv/nas2d-${{ matrix.platform }}.* ; echo "modified=$?" >> $GITHUB_OUTPUT
+          git diff --exit-code --no-patch "origin/${defaultBranch}" dockerBuildEnv/nas2d-${{ matrix.platform }}.* ; echo "modified=$?" >> $GITHUB_OUTPUT
 
       - name: Docker build
         if: ${{ fromJSON(steps.diff.outputs.modified) }}

dockerBuildEnv/makefile

@@ -4,13 +4,12 @@
 # Note: MAKEFILE_LIST's last entry is the last processed Makefile.
 #       That should be the current Makefile, assuming no includes
 DockerBuildEnvFolder := $(abspath $(dir $(lastword ${MAKEFILE_LIST})))
-TopLevelFolder := $(abspath $(DockerBuildEnvFolder)/..)
 
-DockerRunFlags := --volume ${TopLevelFolder}:/code --workdir=/code --rm --tty
+DockerRunFlags = --volume ${CURDIR}:/code --workdir=/code --rm --tty ${DockerAdditionalFlags}
 DockerUserFlags = --user="$(shell id --user):$(shell id --group)"
 DockerRepository ?= ghcr.io/lairworks
 
-include $(wildcard $(DockerBuildEnvFolder)/nas2d-*.version.mk)
+include $(wildcard ${DockerBuildEnvFolder}/nas2d-*.version.mk)
 
 DockerFileName = ${DockerBuildEnvFolder}/nas2d-$*.Dockerfile