diff --git a/README-dockerd.md b/README-dockerd.md index a24ddfd..4ef9dff 100644 --- a/README-dockerd.md +++ b/README-dockerd.md @@ -86,7 +86,7 @@ The config file installed by the package has removed the example `envs:` and `la The log level is set to debug, to assist first setup and should be changed to `info` during normal operation. -The configuration file is a YAML file, which can also generated as a sample configuration file with `./act_runner generate-config`. +The configuration file is a YAML file, which can also generated as a sample configuration file with `./gitea-runner generate-config`. ```bash gitea-runner generate-config > /etc/gitea-runner/config.yaml diff --git a/README-rootless-dockerd.md b/README-rootless-dockerd.md index 92b11bb..e11fcb3 100644 --- a/README-rootless-dockerd.md +++ b/README-rootless-dockerd.md @@ -20,7 +20,7 @@ You will be asked to input: 3. Runner name, you can just leave it blank; 4. Runner labels, you can just leave it blank. -Apart from registering the docker instance, the script also produces a default config file in the `/home/act-runner-rootless/act_runner` directory. +Apart from registering the docker instance, the script also produces a default config file in the `/home/gitea-runner-rootless/runner` directory. ### Configuration diff --git a/gitea-runner.spec b/gitea-runner.spec index 20b3a84..d08fb3a 100644 --- a/gitea-runner.spec +++ b/gitea-runner.spec @@ -50,7 +50,7 @@ Obsoletes: gitea-act-runner < 1.0.0 %description %{common_description} # ############################################################# -# act_runner with dockerd package +# gitea-runner with dockerd package %package %{dockerd} Summary: Enable running gitea actions in docker containers Requires: %{name} @@ -102,7 +102,7 @@ but docker-ce doesn't, so this shim provides that requirement to enable using the act-runner with the non-rootless docker-ce. # ############################################################# -# act_runner with rootless dockerd package +# gitea-runner with rootless dockerd package %package %{rootless_dockerd} Summary: Enable running gitea actions in non-root docker containers @@ -131,7 +131,7 @@ if [ $1 -eq 1 ]; then fi getent group '%{rootless_user}' >/dev/null || groupadd -r '%{rootless_user}' || : getent passwd '%{rootless_user}' >/dev/null || \ - CREATE_MAIL_SPOOL=false useradd -r -m -F -g '%{rootless_user}' -s '/sbin/nologin' -c 'Rootless act_runner docker user' '%{rootless_user}' || : + CREATE_MAIL_SPOOL=false useradd -r -m -F -g '%{rootless_user}' -s '/sbin/nologin' -c 'Rootless Gitea runner docker user' '%{rootless_user}' || : fi %post %{rootless_dockerd} diff --git a/register-rootless.sh b/register-rootless.sh index fb48287..ba1bc30 100644 --- a/register-rootless.sh +++ b/register-rootless.sh @@ -2,8 +2,8 @@ mkdir -p -m 0750 ~gitea-runner-rootless/runner cd ~gitea-runner-rootless/runner -act_runner register -act_runner generate-config | \ +gitea-runner register +gitea-runner generate-config | \ sed -e '/^ A_TEST_ENV/d' -e '/^ - "ubuntu-/d' -e "s:file\: .runner:file\: ${PWD}/.runner:" -e 's/level: info/level: debug/' \ > config.yaml chmod 0640 config.yaml diff --git a/sources b/sources index 52595ab..c5c1ffb 100644 --- a/sources +++ b/sources @@ -1,10 +1,10 @@ -SHA512 (v0.3.0.tar.gz) = fb10da57d799b780302cd5dd37c34e255e41a914ed1db668f0c700b4f15fca1025eb643dabc939842cca97fb5921258af9fa0f83166176533c8d861fd4e8e7d6 -SHA512 (gitea-act-runner.service) = b0673cab4a3d105ecb1a3cd14d19f56a5f3025e8afabe6fe03c2e740a5dff166d7c70f1bdf0ead2e9bfa36b178b0384284bce5307993a40e7009483ff9d42e80 -SHA512 (gitea-act-runner-rootless.service) = 5fc4eb52ee91525e8566d535748cb52a45c60804243484e76df8bbe466cd17cb57c9c4563cf13c201aa97e8756b102c3c4f1c99c54b43634e04df9b6cccd4da1 -SHA512 (dockerd-rootless-user.service) = fe1c831982f8331f3d2bb57f14fa93b14aac2cb6a4e6f6abb61460db9641a56ee5a79214f6b65dd3dc8b6ab4ed58f3f54d463a563f89993a9d70ab2b7699718a -SHA512 (README-dockerd.md) = 30f81b8d73fd1312c439a6efa9e191b501522ebe4e9b318fa08fb6dfd644cb5c903889e92057150eeecff803f49fe19777529d8b1ac2863a2950c6be96a61d00 -SHA512 (README-rootless-dockerd.md) = aa84f6a155e5c2887f8a4e1e4a8a19cfd68955959d76a0ef0c9a1abf1b724d7f15e721eee20c03680114ac80e7854f392c715cd68d18be903682143cf5864f5c -SHA512 (rootless-act_runner-register.sh) = 506bfa23d0977bdcc1c424cc854368060ca3cf210c46797da38452bf28ff4bf31f6a828ff50fb1cdb88ddbae1fe24b935170a3548524c05c39ac7ece9867fb52 -SHA512 (gitea-act-runner-sysusers.conf) = 156a31d250e73f0f7b266591838ff1f45337b062144927fcbe5cbff5cffae9dea519c19cc4914529d12c43e1a0d49941c0c59174f95818ed1a4311bfd464d0cb -SHA512 (gitea-act-runner-tmpfiles.conf) = d2e054d5cc335213d87823e38f85469ad9104907cd4f2b3fd825de56d5a7bb5e2e645541d71dca4121d667873774a4d243d40e6b759b6e5defc226b1370f13d3 -SHA512 (act_runner-register.sh) = 4bba62f5d8c9e2f6101ba2e34e67280f6fad1496aa5aa6e7c351b2d005097a8bb29f83d9b961fb267d110c93236a233e8a5cf5ccc0df4e1dfb1fe328554f6cf5 +SHA512 (v1.0.0.tar.gz) = fa350c123fdbe2f63babf6bc2ea6a9a6ccc7ec67d2dae85f7ea4019ebdff59e65fe46a837f9ff83dc920544b462c56e0589d311885b1a1f0e688b1dd0fa4f702 +SHA512 (gitea-runner.spec) = c59a034da30b0b5c9e0968a395c19897c9a6dcef2a1966278af9db4d4fa8397691551e9ead7b2f9e49fdc97c2a070057397a4cf968e7ef4ca91a4e22962e2d8c +SHA512 (gitea-runner.service) = 97c9e899b6f3ee699861cd21f721ced5046bd2640ca2602dd467a28a456c165e28d36d1b1794ba28edf8268b2aaa4b8d0b1bd2d167dcf4957c425dab92738395 +SHA512 (gitea-runner-rootless.service) = 997e7fe5c6db09dfaeacf19b766fdfe387730581aad4eb66c0a830627b7aadb9c19181877b7d88c595e4bb97a9c56e11974985d14393e3f0e340dd628bfbb391 +SHA512 (gitea-runner-sysusers.conf) = 45686de9cba43227ba925fd9f69106cea3b1fbf357e921e259674c86b44c6aabba8aea6e1ec6907acb777f58abd1b27a17a5d112044b6d0798e2ea886d4a9484 +SHA512 (gitea-runner-sysusers-dockerd.conf) = 67b87d87cb21f5a840c17750b4fc5d877edda3e753b9cd673068eed24084379340bb25c7c0da0ee2c99a8c9eb0c94ba52b851ccdc39ab532da59145c6f296fbd +SHA512 (README-dockerd.md) = cd13154d883057df5757e02c12ddeda8a631db3e52a811e2e853356e82701146bf2ace3ea7d66ab107db3db5215b36dccc1ef3acd7939f0054c2004228babdf7 +SHA512 (README-rootless-dockerd.md) = ce052b5a00b4010d13a07c3a60cbf2b804d6dd7744bc4fc818a20fe6c267e0f804f598fb73ba48b608da3476e52fde1fb4364f79f35ae0dc115b88f3fca61109 +SHA512 (register.sh) = 586fdc649b6fa02481683f32c56d562b3ba7ce4402cb9102d6fd29f936956efa95a60af97e5668ac496108e0b74462811f972ff255141bb8a4032a35f243f246 +SHA512 (register-rootless.sh) = 3662888161c8ea5653779aa3afe4d4fcae438a24750c8becd03def4475fad129ba923ef730078e6d4b002cd39a49f17161dfec1fc2ca414fcfb04865cb143cb2