From 487c6908d04461989f16babec4123aca4997709f Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Fri, 30 Jun 2023 23:06:57 +0200
Subject: [PATCH] add GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST variable

---
 .github/workflows/build.yml |  2 +-
 README.md                   |  1 +
 image/Dockerfile            |  2 +-
 image/config.template.yaml  | 12 +++++++++++-
 image/run.sh                |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 593b5d3..6f2a3b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/docker-gitea-act-runner
 #
-# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 name: Build
 
 on:
diff --git a/README.md b/README.md
index 4b0b3f2..e7aa5ed 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ GITEA_RUNNER_ENV_FILE|`/data/.env`|Extra environment variables to run jobs from
 GITEA_RUNNER_FETCH_TIMEOUT|`5s`|The timeout for fetching the job from the Gitea instance
 GITEA_RUNNER_FETCH_INTERVAL|`2s`|The interval for fetching the job from the Gitea instance
 GITEA_RUNNER_MAX_PARALLEL_JOBS|`1`|Maximum number of concurrently executed jobs
+GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST|`<empty>`|If empty, the available docker host is located automatically. If set to `-`, the available docker host is located automatically, but the docker host won't be mounted to the job containers. If it's any other value, the specified docker host will be used.
 GITEA_RUNNER_JOB_CONTAINER_NETWORK|`bridge`|Docker network to use with job containers. Can be `bridge`, `host`, `none`, or the name of a custom network
 GITEA_RUNNER_JOB_CONTAINER_PRIVILEGED|`false`|Whether to run jobs in containers with privileged mode which is required for **Docker-in-Docker** aka **dind**
 GITEA_RUNNER_JOB_CONTAINER_OPTIONS|`none`|Additional container launch options (eg, --add-host=my.gitea.url:host-gateway)
diff --git a/image/Dockerfile b/image/Dockerfile
index 376f60f..2f1ff48 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -214,7 +214,7 @@ RUN <<EOF
   echo "#################################################"
   echo "Writing build_info..."
   echo "#################################################"
-  echo -e "
+  echo "
 GIT_REPO:    $GIT_REPO_URL
 GIT_BRANCH:  $GIT_BRANCH
 GIT_COMMIT:  $GIT_COMMIT_HASH @ $GIT_COMMIT_DATE
diff --git a/image/config.template.yaml b/image/config.template.yaml
index 08141a6..db04415 100644
--- a/image/config.template.yaml
+++ b/image/config.template.yaml
@@ -1,4 +1,4 @@
-# based on https://gitea.com/gitea/act_runner/src/tag/v0.2.0/internal/pkg/config/config.example.yaml
+# based on https://gitea.com/gitea/act_runner/src/tag/v0.2.1/internal/pkg/config/config.example.yaml
 
 log:
   # The level of logging, can be trace, debug, info, warn, error, fatal
@@ -65,3 +65,13 @@ container:
   # The parent directory of a job's working directory.
   # If it's empty, /workspace will be used.
   workdir_parent: ${GITEA_RUNNER_JOB_CONTAINER_WORKDIR_PARENT:-/workspace}
+  # overrides the docker client host with the specified one.
+  # If it's empty, act_runner will find an available docker host automatically.
+  # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
+  # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
+  docker_host: ${GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST:-}
+
+host:
+  # The parent directory of a job's working directory.
+  # If it's empty, $HOME/.cache/act/ will be used.
+  workdir_parent: ${GITEA_RUNNER_HOST_WORKDIR_PARENT:-}
diff --git a/image/run.sh b/image/run.sh
index 8ec873b..c72eea8 100644
--- a/image/run.sh
+++ b/image/run.sh
@@ -4,7 +4,7 @@
 # SPDX-FileContributor: Sebastian Thomschke
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/docker-gitea-act-runner
-#
+
 source /opt/bash-init.sh
 
 #################################################################