Remove defaults from generated config to avoid overwriting registration

Add full path to .runner in config.yaml
This commit is contained in:
2026-05-28 01:07:10 +02:00
parent 726212a931
commit 6a15077eb8
3 changed files with 7 additions and 7 deletions
+1 -3
View File
@@ -1,4 +1,2 @@
#!/bin/bash
cd ~act-runner
sudo -u act-runner -H act_runner register -c $(rpm --eval '%{_sysconfdir}')/gitea-act-runner/config.yaml
sudo -u act-runner act_runner register -c "$(rpm --eval '%{_sysconfdir}')/gitea-act-runner/config.yaml"
+5 -3
View File
@@ -82,8 +82,8 @@ fi
%package %{dockerd_rootless}
Summary: Enable running gitea actions in non-root docker containers
Requires: %{name} iptables
Requires: ( docker-ce-rootless-extras or moby-rootless-extras ) shadow-utils
Requires: %{name} iptables sed shadow-utils
Requires: ( moby-engine-rootless-extras or docker-ce-rootless-extras )
Conflicts: %{name}-%{dockerd}
%{?%systemd_requires}
@@ -133,7 +133,9 @@ install -m 0755 -vd %{buildroot}%{_sysconfdir}/%{name}
install -D -m 0644 -vp %{SOURCE1} %{buildroot}%{_unitdir}/%{act_runner_service}
install -D -m 0644 %{SOURCE7} %{buildroot}%{_sysusersdir}/%{name}.conf
install -D -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}-%{dockerd}.conf
bin/act_runner generate-config > %{buildroot}%{_sysconfdir}/%{name}/config.yaml
bin/%{runner_bin} generate-config | \
sed -e '/^ A_TEST_ENV/d' -e '/^ - "ubuntu-/d' -e 's:file\: .runner:file\: %{_sharedstatedir}/%{name}/.runner:' -e 's/level: info/level: debug/' \
> %{buildroot}%{_sysconfdir}/%{name}/config.yaml
install -D -m 0755 -vp %{SOURCE8} %{buildroot}%{_datadir}/%{name}/act_runner-register.sh
# dockerd-rootless
+1 -1
View File
@@ -3,6 +3,6 @@
mkdir -p -m 0750 ~act-runner-rootless/act_runner
cd ~act-runner-rootless/act_runner
act_runner register
act_runner generate-config > config.yaml
act_runner generate-config | sed -e '/^ A_TEST_ENV/d' -e '/^ - "ubuntu-/d' -e "s:file\: .runner:file\: ${PWD}/.runner:" > config.yaml
chmod 0640 config.yaml
chown -R act-runner-rootless:act-runner-rootless ~act-runner-rootless/act_runner