From 46f6cce2e55c6fa1b2f068081eaf71d701db50ed Mon Sep 17 00:00:00 2001 From: "Kelly Sovacool, PhD" Date: Fri, 24 Jan 2025 13:00:43 -0500 Subject: [PATCH] fix: need dockerfile basename for copying within docker build process (#59) * fix: need dockerfile basename for copying within docker build process because the context is now inside the parent dir of the dockerfile * chore: update CHANGELOG.md --- CHANGELOG.md | 1 + build-docker/action.yml | 3 ++- scripts/prepare_docker_build_variables.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67d06f5..1e52477 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## actions development version - fix `post-release` to make sure the sliding branch is created from the latest release tag. (#53, @kelly-sovacool) +- fix `build-docker` to set `$DOCKERFILE_BASENAME` for copying the Dockerfile inside the container. (#59, @kelly-sovacool) - improvements to documentation website: - add contributors page. (#54, @kelly-sovacool) - list example workflows and improve navigation. (#55, @kelly-sovacool) diff --git a/build-docker/action.yml b/build-docker/action.yml index 0f96921..aaf8f01 100644 --- a/build-docker/action.yml +++ b/build-docker/action.yml @@ -105,6 +105,7 @@ runs: id: check_and_create_readme run: | echo "DOCKERFILE: $DOCKERFILE" + echo "DOCKERFILE_BASENAME: $DOCKERFILE_BASENAME" echo "IMAGENAME: $IMAGENAME" echo "BASEIMAGENAME: $BASEIMAGENAME" echo "BUILD_DATE: $BUILD_DATE" @@ -128,7 +129,7 @@ runs: push: ${{ inputs.push }} tags: ${{ env.IMAGENAME }} build-args: | - DOCKERFILE=${{ env.DOCKERFILE }} + DOCKERFILE=${{ env.DOCKERFILE_BASENAME }} BUILD_DATE=${{ env.BUILD_DATE }} BUILD_TAG=${{ env.BUILD_TAG }} REPONAME=${{ env.REPONAME }} diff --git a/scripts/prepare_docker_build_variables.sh b/scripts/prepare_docker_build_variables.sh index 7301aa7..3ef01fd 100644 --- a/scripts/prepare_docker_build_variables.sh +++ b/scripts/prepare_docker_build_variables.sh @@ -61,6 +61,7 @@ artifact_name=$(echo $mdfile | sed 's|/|_|g') # Output each variable to $GITHUB_ENV to pass it to the next steps echo "DOCKERFILE=$dockerfile" >> $GITHUB_ENV +echo "DOCKERFILE_BASENAME=$bn_dockerfile" >> $GITHUB_ENV echo "CONTEXT=$(dirname $dockerfile)" >> $GITHUB_ENV echo "IMAGENAME=$imagename" >> $GITHUB_ENV echo "BASEIMAGENAME=$baseimagename" >> $GITHUB_ENV