Fix systemd unit startup hanging

dockerd-rootless-user.service

@@ -1,16 +1,18 @@
 [Unit]
 Description=Docker Application Container Engine (Rootless)
 Documentation=https://docs.docker.com/go/rootless/
+After=network-online.target firewalld.service time-set.target
+Wants=network-online.target
 Requires=dbus.socket
 
 [Service]
-ExecStart=/usr/bin/dockerd-rootless.sh
+ExecStart=/usr/bin/dockerd-rootless.sh --iptables=false
 ExecReload=/bin/kill -s HUP \$MAINPID
 TimeoutSec=0
 RestartSec=2
 Restart=always
 StartLimitBurst=3
-StartLimitInterval=60s
+StartLimitIntervalSec=60
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity

gitea-act-runner-rootless.service

@@ -8,18 +8,19 @@ Environment=XDG_RUNTIME_DIR=/run/user/%U
 Environment=DOCKER_HOST=unix:///run/user/%U/docker.sock
 ExecStart=/usr/bin/act_runner daemon -c %h/act_runner/config.yaml
 ExecReload=/bin/kill -s HUP $MAINPID
+Type=exec
 WorkingDirectory=%h/act_runner
-TimeoutSec=0
+TimeoutStartSec=5
+TimeoutStopSec=120
 RestartSec=2
 Restart=always
 StartLimitBurst=3
-StartLimitInterval=60s
+StartLimitIntervalSec=60
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TasksMax=infinity
 Delegate=yes
-Type=notify
 NotifyAccess=all
 KillMode=mixed
 

gitea-act-runner.service

@@ -9,17 +9,18 @@ Environment=DOCKER_HOST=unix:///run/docker.sock
 ExecStart=/usr/bin/act_runner daemon -c /etc/gitea-act-runner/config.yaml
 ExecReload=/bin/kill -s HUP $MAINPID
 WorkingDirectory=%h/act_runner
-TimeoutSec=0
+Type=exec
+TimeoutStartSec=5
+TimeoutStopSec=120
 RestartSec=2
 Restart=always
 StartLimitBurst=3
-StartLimitInterval=60s
+StartLimitIntervalSec=60
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TasksMax=infinity
 Delegate=yes
-Type=notify
 NotifyAccess=all
 KillMode=mixed
 

gitea-act-runner.spec

@@ -16,7 +16,7 @@ A runner for Gitea based on act.}
 
 Name:           gitea-act-runner
 Version:        0.2.10
-Release:        %autorelease -b 9
+Release:        %autorelease -b 11
 Summary:        A runner for Gitea based on act.
 
 %global act_runner_service          %{name}.service
@@ -94,9 +94,9 @@ fi
 %post %{dockerd_rootless}
 %systemd_user_post %{act_runner_rootless_service} %{dockerd_rootless_service}
 if [ $1 -eq 1 ] || [ ! -d /home/%{runner_user_rootless}/act_runner ]; then
-    loginctl enable-linger %{runner_user_rootless}
     echo '  INFO Please read README.%{rootless}-%{dockerd}.md to finish the installation'
 fi
+loginctl enable-linger %{runner_user_rootless}
 
 %preun %{dockerd_rootless}
 %systemd_user_preun %{dockerd_rootless_service} %{act_runner_rootless_service}