Replace path input with extra_path input due to Dockerfile ENV PATH b…

…eing overwritten, so we're opting to explicitly set the PATH in entrypoint script with extra PATH being pre-pended to the original PATH.

.github/workflows/ci-workflow.yaml

@@ -39,4 +39,4 @@ jobs:
           command: 'echo "$PATH"'
           image: ubuntu:22.04
           shell: bash
-          path: '/some/path:/opt/workspace/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+          extra_path: '/some/path:/opt/workspace/bin'

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
-- Add path input configuration
+- Add extra_path input configuration
 
 ## 1.2.0 - 2024-11-01
 ### Added

Dockerfile

@@ -2,8 +2,6 @@ ARG IMAGE=alpine:3.20
 FROM ${IMAGE}
 CMD mkdir -p /opt/workspace/
 WORKDIR /opt/workspace/
-ARG PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-ENV PATH="${PATH}"
 ARG SHELL=sh
 COPY entrypoint-${SHELL}.sh /opt/entrypoint.sh
 ENTRYPOINT ["/opt/entrypoint.sh"]

README.md

@@ -59,6 +59,6 @@ Configuration
 |-------|------|-------------|----------|---------|---------|
 | command | string | Shell command to be executed via a Docker container | Yes | - |  `cat /etc/*-release` |
 | image | string | Docker image to be used for running the container | No | `alpine:3.20` | `ubuntu:22.04` |
-| path | string | Shell to be used for running the command | No | `/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin` | `/some/path:/opt/workspace/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin` |
+| extra_path | string | Extra PATH environment variable to be added to original PATH during shell command execution | No | `` | `/some/path:/opt/workspace/bin` |
 | shell | string | PATH environment variable to be set during shell command execution | No | `sh` | `sh`, `bash` |
 | env_file | string | Path to env file containing environment variables  made available during shell command execution | No | `` | `/tmp/.env` |

action.yml

@@ -24,15 +24,15 @@ inputs:
     type: string
     required: false
     default: 'sh'
-  path:
+  extra_path:
     description: |
-      PATH environment variable to be set during shell command execution
+      Extra PATH environment variable to be added to original PATH during shell command execution
     type: string
     required: false
-    default: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+    default: ''
   env_file:
     description: |
-      Path to env file containing environment variables  made available during shell command execution
+      Path to env file containing environment variables made available during shell command execution
     type: string
     required: false
     default: ''
@@ -42,7 +42,7 @@ runs:
     - name: Build Docker image on the the GitHub Action directory
       shell: sh
       run: |
-        cd $GITHUB_ACTION_PATH && docker build -f Dockerfile --build-arg IMAGE=${{ inputs.image }} --build-arg PATH=${{ inputs.path }} --build-arg SHELL=${{ inputs.shell }} -t local_image:8.8.8 .
+        cd $GITHUB_ACTION_PATH && docker build -f Dockerfile --build-arg IMAGE=${{ inputs.image }} --build-arg SHELL=${{ inputs.shell }} -t local_image:8.8.8 .
     - name: Run Docker container on the GitHub Workspace directory
       if: inputs.env_file == ''
       shell: sh
@@ -52,4 +52,4 @@ runs:
       if: inputs.env_file != ''
       shell: sh
       run: |
-        cd $GITHUB_WORKSPACE && docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v .:/opt/workspace/ --env-file "${{ inputs.env_file }}" --name local_container local_image:8.8.8 "${{ inputs.command }}"
+        cd $GITHUB_WORKSPACE && docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v .:/opt/workspace/ --env-file "${{ inputs.env_file }}" --name local_container local_image:8.8.8 "${{ inputs.command }}" "${{ inputs.extra_path }}"

entrypoint-bash.sh

@@ -3,6 +3,9 @@ set -o errexit
 set -o nounset
 
 COMMAND="${1}"
+EXTRA_PATH="${2}"
+
+export PATH="${EXTRA_PATH}:${PATH}"
 
 echo "PATH: ${PATH}"
 

entrypoint-sh.sh

@@ -3,6 +3,9 @@ set -o errexit
 set -o nounset
 
 COMMAND="${1}"
+EXTRA_PATH="${2}"
+
+export PATH="${EXTRA_PATH}:${PATH}"
 
 echo "PATH: ${PATH}"