From 86c8f39603ccac892afc36602cf201dc7e36981a Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 09:39:05 -0300 Subject: [PATCH 01/11] generalize volume mount --- .github/workflows/tests.yml | 2 +- action.yml | 2 +- entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e40e412..b4e9476 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,7 +39,7 @@ jobs: with: image: docker shell: sh - run: | + run: | echo "::set-output name=file-contents::`cat someFile`" - name: Check if file contents match uses: actions/github-script@v6 diff --git a/action.yml b/action.yml index 61c2d09..cb01d82 100644 --- a/action.yml +++ b/action.yml @@ -6,7 +6,7 @@ inputs: required: true workspace: description: 'workspace mount' - default: /tmp/clickable/${{ github.event.repository.name }} + default: ${{ github.event.repository.name }} required: false shell: description: 'Use a specific shell' diff --git a/entrypoint.sh b/entrypoint.sh index 45ff44a..45412a3 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x -exec docker run --env-file docker-run-action.env --workdir "$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$RUNNER_WORKSPACE":"/tmp/clickable" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From c153c6f9552e06d76920d66f6b6ca63307508cb4 Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 19:20:07 -0300 Subject: [PATCH 02/11] smoke test update from set-output to env var --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b4e9476..ae8c511 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: image: docker:20.10.3 shell: sh run: | - echo "::set-output name=docker-version::`echo $DOCKER_VERSION`" + echo "docker-version=$DOCKER_VERSION" >> $GITHUB_OUTPUT - name: Test the output uses: actions/github-script@v6 with: From 578305756c7a4d297cc2cef427cfe744dcc9bd2a Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 19:35:59 -0300 Subject: [PATCH 03/11] mount the entirety of /github to ensure $GITHUB_OUTPUT exists --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 45412a3..c57770f 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x -exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github":"/github" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From 17a349e908a5594fce805f81ab16b2a14ca7e18b Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 19:43:08 -0300 Subject: [PATCH 04/11] fix volume mount test --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index c57770f..43ad8af 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x -exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github":"/github" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github":"/github" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From 96377fcde2747f87a5aeab650130ea1ada16f163 Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 19:54:13 -0300 Subject: [PATCH 05/11] inspect /gihub on a higher level --- entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 43ad8af..ea844fe 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x -exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github":"/github" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +ls /github +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From 7d636486d262ab7a44db9ad979cec28dc24a37fb Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 21:34:15 -0300 Subject: [PATCH 06/11] sanity check --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ae8c511..eaea08c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,9 @@ jobs: image: docker:20.10.3 shell: sh run: | + echo "DOCKER_VERSION="$DOCKER_VERSION echo "docker-version=$DOCKER_VERSION" >> $GITHUB_OUTPUT + echo "docker-version="${{ steps.run-docker.outputs.docker-version }} - name: Test the output uses: actions/github-script@v6 with: @@ -41,6 +43,7 @@ jobs: shell: sh run: | echo "::set-output name=file-contents::`cat someFile`" + echo "file-contents:"${{ steps.run-docker.outputs.file-contents }} - name: Check if file contents match uses: actions/github-script@v6 with: From f0ac951931bc6ff3dd903c207e5c1e8eb3d5419b Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 21:49:44 -0300 Subject: [PATCH 07/11] more mounts --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index ea844fe..1fcc5fb 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,4 +2,4 @@ env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x ls /github -exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github/home":"/github/home" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From cf539c47ad2c145d64d401593486b217d6b5573c Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 22:04:44 -0300 Subject: [PATCH 08/11] show me the environment --- entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/entrypoint.sh b/entrypoint.sh index 1fcc5fb..3e56f1c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x +env | egrep -v "(RUNNER_*|GITHUB_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env ls /github exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github/home":"/github/home" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From 451366f23e38c92cda748de3a3da72324e9e3655 Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 22:07:25 -0300 Subject: [PATCH 09/11] all is bare --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 3e56f1c..559ccd2 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x -env | egrep -v "(RUNNER_*|GITHUB_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env +env | egrep -v "(RUNNER_*|GITHUB_*)" | awk '$1 ~ /^\w+=/' | xargs -0 ls /github exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github/home":"/github/home" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From 61f88dc533fc840c95b0f5225d1b7c41aa941535 Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 22:12:08 -0300 Subject: [PATCH 10/11] how did i miss that --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 559ccd2..6267003 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xargs -0 > docker-run-action.env set -x -env | egrep -v "(RUNNER_*|GITHUB_*)" | awk '$1 ~ /^\w+=/' | xargs -0 +env | egrep "(RUNNER_*|GITHUB_*)" | awk '$1 ~ /^\w+=/' | xargs -0 ls /github -exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "/github/home":"/github/home" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$HOME":"$HOME" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" From eddc03119789d0cb90589eb16d17edfbb862dc41 Mon Sep 17 00:00:00 2001 From: Rahammetoela Toekiman Date: Wed, 2 Nov 2022 22:35:15 -0300 Subject: [PATCH 11/11] even more mounts, SURELY this is it --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 6267003..09bd6a8 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,4 +3,4 @@ env | egrep -v "^(#|;| |PATH|SHLVL|HOSTNAME|DOCKER_*)" | awk '$1 ~ /^\w+=/' | xa set -x env | egrep "(RUNNER_*|GITHUB_*)" | awk '$1 ~ /^\w+=/' | xargs -0 ls /github -exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$HOME":"$HOME" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}" +exec docker run --env-file docker-run-action.env --workdir "$RUNNER_WORKSPACE/$INPUT_WORKSPACE" -v "/var/run/docker.sock":"/var/run/docker.sock" -v "$HOME":"$HOME" -v "/github/workflow":"/github/workflow" -v "/github/file_commands":"/github/file_commands" -v "$GITHUB_WORKSPACE":"$GITHUB_WORKSPACE" -v "$GITHUB_PATH":"$GITHUB_PATH" -v "$RUNNER_TEMP":"$RUNNER_TEMP" -v "$GITHUB_STATE":"$GITHUB_STATE" -v "$GITHUB_ENV":"$GITHUB_ENV" -v "$GITHUB_EVENT_PATH":"$GITHUB_EVENT_PATH" -v "$GITHUB_STEP_SUMMARY":"$GITHUB_STEP_SUMMARY" -v "$RUNNER_TOOL_CACHE":"$RUNNER_TOOL_CACHE" -v "$RUNNER_WORKSPACE":"$RUNNER_WORKSPACE" -v "$GITHUB_OUTPUT":"$GITHUB_OUTPUT" --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "${INPUT_RUN//$'\n'/;}"