1
0
Fork 0

fix runner multiarch

This commit is contained in:
Massaki Archambault 2025-04-06 15:09:37 -04:00
parent 4e52955c72
commit 133a333f9e
3 changed files with 36 additions and 8 deletions

View File

@ -25,6 +25,9 @@ configMapGenerator:
literals: literals:
- GITEA_EXTERNAL_HOST=code.badjware.dev - GITEA_EXTERNAL_HOST=code.badjware.dev
- GITEA_EXTERNAL_URL=https://code.badjware.dev - GITEA_EXTERNAL_URL=https://code.badjware.dev
- name: runner-scripts
files:
- runner-entrypoint.sh=scripts/runner-entrypoint.sh
replacements: replacements:
- source: - source:
@ -47,6 +50,16 @@ replacements:
name: runner-arm64 name: runner-arm64
fieldPaths: fieldPaths:
- spec.template.spec.containers - spec.template.spec.containers
- source:
kind: StatefulSet
name: runner-amd64
fieldPath: spec.template.spec.volumes
targets:
- select:
kind: StatefulSet
name: runner-arm64
fieldPaths:
- spec.template.spec.volumes
- source: - source:
kind: StatefulSet kind: StatefulSet
name: runner-amd64 name: runner-amd64

View File

@ -33,7 +33,7 @@ spec:
containers: containers:
- name: runner - name: runner
image: gitea/act_runner:nightly image: gitea/act_runner:nightly
command: ["sh", "-c", "while ! nc -z localhost 2376 </dev/null; do echo 'waiting for docker daemon...'; sleep 5; done; /sbin/tini -- run.sh"] command: ["sh", "/scripts/runner-entrypoint.sh"]
env: env:
- name: NAMESPACE - name: NAMESPACE
valueFrom: valueFrom:
@ -58,12 +58,14 @@ spec:
value: "1" value: "1"
resources: resources:
requests: requests:
memory: 200Mi memory: 500Mi
cpu: 200m cpu: 500m
limits: limits:
memory: 200Mi memory: 500Mi
cpu: 200m cpu: 500m
volumeMounts: volumeMounts:
- name: runner-scripts
mountPath: /scripts
- name: runner-data-pvc - name: runner-data-pvc
mountPath: /data mountPath: /data
- name: docker - name: docker
@ -74,8 +76,12 @@ spec:
- name: DOCKER_TLS_CERTDIR - name: DOCKER_TLS_CERTDIR
value: /data/certs value: /data/certs
volumeMounts: volumeMounts:
- name: runner-data-pvc - name: runner-data-pvc
mountPath: /data mountPath: /data
volumes:
- name: runner-scripts
configMap:
name: runner-scripts
volumeClaimTemplates: volumeClaimTemplates:
- metadata: - metadata:
name: runner-data-pvc name: runner-data-pvc
@ -84,7 +90,7 @@ spec:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: 1Gi storage: 100Mi
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
@ -119,4 +125,5 @@ spec:
values: values:
- arm64 - arm64
containers: [] containers: []
volumes: []
volumeClaimTemplates: [] volumeClaimTemplates: []

View File

@ -0,0 +1,8 @@
#!/bin/sh
export GITEA_RUNNER_LABELS="linux:host,linux-$(apk --print-arch):host"
apk add --no-cache nodejs docker
while ! nc -z localhost 2376 </dev/null; do
echo 'waiting for docker daemon...';
sleep 5;
done
exec /sbin/tini -- run.sh