fix

fabio-ivona · fabio-ivona · commit de533b908006 · 2021-12-01T13:23:52.000+01:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: build and publish
+name: publish
 
 
 on:
diff --git a/Dockerfile b/Dockerfile
@@ -32,3 +32,5 @@ RUN sudo curl -o runner.tar.gz -sSL https://github.com/actions/runner/releases/d
 
 ENTRYPOINT ["./entrypoint.sh"]
 CMD ["./bin/Runner.Listener", "run", "--startuptype", "service"]
+
+#CMD [ "bash", "-c", "./config.sh --url ${RUNNER_URL} --token ${RUNNER_TOKEN} --name runner --runnergroup Default --labels linux,self-hosted --work /tmp/runner; ./run.sh; sleep infinity"]
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-export RUNNER_URL=https://github.com/${ORG}
 export -n ACCESS_TOKEN
-export RUNNER_NAME_PREFIX=runner
-export RUNNER_WORKDIR=/tmp/runner
-export LABELS="linux,self-hosted"
+_RUNNER_URL=https://github.com/${ORG}
+_RUNNER_NAME_PREFIX=${RUNNER_NAME_PREFIX:-"runner"}
+_RUNNER_WORKDIR=${RUNNER_WORKDIR:-"/tmp/runner"}
+_LABELS=${LABELS:-"linux,self-hosted"}
+
 
 deregister_runner() {
   echo "Caught SIGTERM. Deregistering runner"
+  echo "Obtaining the token of the runner"
   if [[ -n "${ACCESS_TOKEN}" ]]; then
     _TOKEN=$(ACCESS_TOKEN="${ACCESS_TOKEN}" bash /home/runner/token.sh)
     RUNNER_TOKEN=$(echo "${_TOKEN}" | jq -r .token)
@@ -16,29 +18,34 @@ deregister_runner() {
   exit
 }
 
-_RUNNER_NAME=${RUNNER_NAME:-${RUNNER_NAME_PREFIX:-github-runner}-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 13 ; echo '')}
+_RUNNER_NAME=${RUNNER_NAME:-${_RUNNER_NAME_PREFIX:-github-runner}-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 13 ; echo '')}
 
 configure_runner(){
   if [[ -n "${ACCESS_TOKEN}" ]]; then
     echo "Obtaining the token of the runner"
     _TOKEN=$(ACCESS_TOKEN="${ACCESS_TOKEN}" bash /home/runner/token.sh)
+    echo ${_TOKEN}
     RUNNER_TOKEN=$(echo "${_TOKEN}" | jq -r .token)
+    echo ${RUNNER_TOKEN}
+    echo "done"
   fi
 
   echo "Configuring"
     ./config.sh \
-        --url "${RUNNER_URL}" \
+        --url "${_RUNNER_URL}" \
         --token "${RUNNER_TOKEN}" \
         --name "${_RUNNER_NAME}" \
-        --work "${RUNNER_WORKDIR}" \
-        --labels "${LABELS}" \
+        --work "${_RUNNER_WORKDIR}" \
+        --labels "${_LABELS}" \
         --runnergroup "Default" \
         --unattended \
-        --replace
+        --replace ${_EPHEMERAL}
 }
 
 configure_runner
 
 trap deregister_runner SIGINT SIGQUIT SIGTERM INT TERM QUIT
 
-"$@"
+"${@}" &
+
+wait $!

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: build and publish`
	`1`	`+name: publish`
`2`	`2`
`3`	`3`
`4`	`4`	`on:`