chore(revert): revert docker info changes and rely on act_runner built-in init-stage (#48)

This PR aims to revert the change were we introduce the `docker info` command as the checker for Docker readiness.
We now rely on the act_runner's ability to do this itself.

Co-authored-by: Daan Selen <dselen@systemec.nl>
Reviewed-on: https://gitea.com/gitea/helm-actions/pulls/48
Reviewed-by: ChristopherHX <christopherhx@noreply.gitea.com>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: DaanSelen <dselen@nerthus.nl>
Co-committed-by: DaanSelen <dselen@nerthus.nl>
This commit is contained in:
DaanSelen
2025-09-11 03:49:34 +00:00
committed by Lunny Xiao
parent 6d82ade984
commit 1e51423d3a
4 changed files with 6 additions and 17 deletions

View File

@@ -34,7 +34,7 @@ If `.Values.image.rootless: true`, then the following will occur. In case you us
| `statefulset.affinity` | Affinity for the statefulset | `{}` |
| `statefulset.extraVolumes` | Extra volumes for the statefulset | `[]` |
| `statefulset.actRunner.repository` | The Gitea act runner image | `gitea/act_runner` |
| `statefulset.actRunner.tag` | The Gitea act runner tag | `0.2.12` |
| `statefulset.actRunner.tag` | The Gitea act runner tag | `0.2.13` |
| `statefulset.actRunner.pullPolicy` | The Gitea act runner pullPolicy | `IfNotPresent` |
| `statefulset.actRunner.extraVolumeMounts` | Allows mounting extra volumes in the act runner container | `[]` |
| `statefulset.actRunner.config` | Act runner custom configuration. See [Act Runner documentation](https://docs.gitea.com/usage/actions/act-runner#configuration) for details. | `Too complex. See values.yaml` |

View File

@@ -48,20 +48,6 @@ spec:
image: "{{ .Values.statefulset.actRunner.repository }}:{{ .Values.statefulset.actRunner.tag }}"
imagePullPolicy: {{ .Values.statefulset.actRunner.pullPolicy }}
workingDir: /data
command:
# The following is a workaround for: https://gitea.com/gitea/act_runner/issues/731
# We must add the docker-cli package for the server AND client cert verification.
- sh
- -c
- |
apk add --no-cache docker-cli
echo "Waiting for Docker daemon..."
until timeout 10 docker info > /dev/null; do
echo "Failed, retrying..."
sleep 2
done
echo "Docker is ready, starting act-runner..."
exec run.sh
env:
- name: DOCKER_HOST
value: tcp://127.0.0.1:2376

View File

@@ -69,7 +69,7 @@ tests:
name: gitea-unittests-actions-act-runner
- equal:
path: spec.template.metadata.annotations["checksum/config"]
value: "7566d9c60261bf8cbff6a6936fc7aead96cec540d8c793d142a5ad4664c56ba5"
value: "2bafbf04b3c4293c8ddf895ae3d908e14176ee54a6c724c8cf5b2a1e43c6ece7"
- it: renders a StatefulSet http (with correct GITEA_INSTANCE_URL env from giteaRootURL)
template: templates/statefulset.yaml
set:

View File

@@ -39,7 +39,7 @@ statefulset:
actRunner:
repository: gitea/act_runner
tag: 0.2.12
tag: 0.2.13
pullPolicy: IfNotPresent
extraVolumeMounts: []
@@ -49,6 +49,9 @@ statefulset:
level: debug
cache:
enabled: false
container:
require_docker: true
docker_timeout: 300s
dind:
repository: docker