parent 358af5c

author Yossi Farjoun <[email protected]> 1617479686 -0400 committer Yossi Farjoun <[email protected]> 1618455120 -0400 Change the way the script is run. instead of modfying the ENTRYPOINT, we will simply add the "shell" (default sh) and the "script_prefix" (default -c) and then the script. That way the possible comple entry point is not disturbed. if a user would like to remove the ENTRYPOINT they can provide an "option" "--entrypoint ''" for example.
addnab · Apr 15, 2021 · 2f4bbe9 · 2f4bbe9
1 parent 358af5c
commit 2f4bbe9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ name: Docker Run Action Tests
 on:
   push:
     branches:
-      - main
+      - '**'
   pull_request:
 
 jobs:

diff --git a/README.md b/README.md
@@ -55,4 +55,4 @@
     run: |
       echo "first line"
       echo "second line"
-```
+
diff --git a/action.yml b/action.yml
@@ -15,6 +15,10 @@ inputs:
     description: 'Use a specific shell'
     required: false
     default: sh
+  script_prefix: 
+    description: 'a prefix telling the shell to execute the following (single) string as a script'
+    required: false
+    default: -c
   registry:
     description: 'Registry'
     required: false

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -8,4 +8,4 @@ if [ ! -z $INPUT_DOCKER_NETWORK ];
 then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK"
 fi
 
-exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}"
+exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_IMAGE $INPUT_SHELL $INPUT_SCRIPT_PREFIX "${INPUT_RUN//$'\n'/;}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Docker Run Action Tests @@
     on:
       push:
         branches:
-          - main
+          - '**'
       pull_request:
     jobs:
@@ Expand Down @@