Merge branch 'main' into main

fix(deps): update module github.com/avast/retry-go/v4 to v4.5.1 (#411 )
Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>
2025-12-18 20:14:48 +00:00 · 2023-12-01 13:47:01 +00:00 · 2023-11-28 05:46:05 +00:00 · 2023-11-28 05:45:28 +00:00 · 2023-11-28 01:45:18 +00:00 · 2023-11-26 00:01:51 +00:00
13 changed files with 387 additions and 155 deletions
--- a/.gitea/workflows/release-nightly.yml
+++ b/.gitea/workflows/release-nightly.yml
@@ -15,7 +15,7 @@ jobs:
      - uses: actions/checkout@v3
        with:
          fetch-depth: 0 # all history for all branches and tags
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
        with:
          go-version: '>=1.21.0'
      - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
@@ -59,13 +59,13 @@ jobs:
          fetch-depth: 0 # all history for all branches and tags

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
@@ -77,9 +77,7 @@ jobs:
          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT

      - name: Build and push
-        uses: docker/build-push-action@v4
-        env:
-          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
+        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./Dockerfile
@@ -91,7 +89,7 @@ jobs:
            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

      - name: Build and push dind-rootless
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
        env:
          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
        with:
--- a/.gitea/workflows/release-tag.yml
+++ b/.gitea/workflows/release-tag.yml
@@ -16,7 +16,7 @@ jobs:
      - uses: actions/checkout@v3
        with:
          fetch-depth: 0 # all history for all branches and tags
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
        with:
          go-version: '>=1.21.0'
      - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
@@ -70,13 +70,13 @@ jobs:
          fetch-depth: 0 # all history for all branches and tags

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
@@ -88,9 +88,7 @@ jobs:
          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT

      - name: Build and push
-        uses: docker/build-push-action@v4
-        env:
-          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
+        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./Dockerfile
@@ -103,7 +101,7 @@ jobs:
            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

      - name: Build and push dind-rootless
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
        env:
          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
        with:
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -12,8 +12,8 @@ jobs:
    name: check and test
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v4
        with:
          go-version: '>=1.21.0'
      - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
--- a/examples/docker-compose/README.md
+++ b/examples/docker-compose/README.md
@@ -18,6 +18,29 @@
      - GITEA_INSTANCE_URL=<instance url>
      # When using Docker Secrets, it's also possible to use
      # GITEA_RUNNER_REGISTRATION_TOKEN_FILE to pass the location.
-      # The env var takes precedence
+      # The env var takes precedence.
+      # Needed only for the first start.
+      - GITEA_RUNNER_REGISTRATION_TOKEN=<registration token>
+```
+
+### Running `act_runner` using Docker-in-Docker (DIND) 
+
+```yml
+...
+  runner:
+    image: gitea/act_runner:latest-dind-rootless
+    restart: always
+    privileged: true
+    depends_on:
+      - gitea
+    volumes:
+      - ./data/act_runner:/data
+    environment:
+      - GITEA_INSTANCE_URL=<instance url>
+      - DOCKER_HOST=unix:///var/run/user/1000/docker.sock
+      # When using Docker Secrets, it's also possible to use
+      # GITEA_RUNNER_REGISTRATION_TOKEN_FILE to pass the location.
+      # The env var takes precedence.
+      # Needed only for the first start.
      - GITEA_RUNNER_REGISTRATION_TOKEN=<registration token>
 ```
--- a/examples/kubernetes/rootless-docker.yaml
+++ b/examples/kubernetes/rootless-docker.yaml
@@ -41,6 +41,8 @@ spec:
      - name: runner-data
        persistentVolumeClaim:
          claimName: act-runner-vol
+      securityContext:
+        fsGroup: 1000
      containers:
      - name: runner
        image: gitea/act_runner:nightly-dind-rootless
--- a/go.mod
+++ b/go.mod
@@ -4,18 +4,19 @@ go 1.21

 require (
 	code.gitea.io/actions-proto-go v0.3.1
-	code.gitea.io/gitea-vet v0.2.3-0.20230113022436-2b1561217fa5
-	github.com/avast/retry-go/v4 v4.5.0
+	code.gitea.io/gitea-vet v0.2.3
+	github.com/avast/retry-go/v4 v4.5.1
 	github.com/bufbuild/connect-go v1.10.0
-	github.com/docker/docker v24.0.6+incompatible
+	github.com/docker/docker v24.0.7+incompatible
 	github.com/joho/godotenv v1.5.1
-	github.com/mattn/go-isatty v0.0.19
+	github.com/kardianos/service v1.2.2
+	github.com/mattn/go-isatty v0.0.20
 	github.com/nektos/act v0.2.51
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/term v0.12.0
-	golang.org/x/time v0.3.0
+	golang.org/x/term v0.13.0
+	golang.org/x/time v0.5.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.1
@@ -33,8 +34,9 @@ require (
 	github.com/creack/pty v1.1.18 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/cli v24.0.6+incompatible // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.0 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@@ -68,9 +70,9 @@ require (
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rhysd/actionlint v1.6.25 // indirect
+	github.com/rhysd/actionlint v1.6.26 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/robfig/cron v1.2.0 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@@ -85,10 +87,10 @@ require (
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/tools v0.13.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

-replace github.com/nektos/act => gitea.com/gitea/act v0.2.51
+replace github.com/nektos/act => gitea.com/gitea/act v0.251.1
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,11 @@
 code.gitea.io/actions-proto-go v0.3.1 h1:PMyiQtBKb8dNnpEO2R5rcZdXSis+UQZVo/SciMtR1aU=
 code.gitea.io/actions-proto-go v0.3.1/go.mod h1:00ys5QDo1iHN1tHNvvddAcy2W/g+425hQya1cCSvq9A=
-code.gitea.io/gitea-vet v0.2.3-0.20230113022436-2b1561217fa5 h1:daBEK2GQeqGikJESctP5Cu1i33z5ztAD4kyQWiw185M=
-code.gitea.io/gitea-vet v0.2.3-0.20230113022436-2b1561217fa5/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE=
+code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI=
+code.gitea.io/gitea-vet v0.2.3/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-gitea.com/gitea/act v0.2.51 h1:gXc/B4OlTciTTzAx9cmNyw04n2SDO7exPjAsR5Idu+c=
-gitea.com/gitea/act v0.2.51/go.mod h1:CoaX2053jqBlD6JMgu4d4UgFL/rp2I14Kt5mMqcs0Z0=
+gitea.com/gitea/act v0.251.1 h1:hwjmDKmYD8TCzpYY+AmDVwhf7pNj67rAEOVa7+wRdA8=
+gitea.com/gitea/act v0.251.1/go.mod h1:YthlRq0FUQIzgfJ3ZWvCvVq3I3VsC9s2NYQ9b2Uxccs=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
@@ -27,6 +27,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg=
 github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I=
+github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
+github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/bufbuild/connect-go v1.10.0 h1:QAJ3G9A1OYQW2Jbk3DeoJbkCxuKArrvZgDt47mjdTbg=
 github.com/bufbuild/connect-go v1.10.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
@@ -34,7 +36,7 @@ github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEM
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o=
 github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
@@ -42,12 +44,14 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
+github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=
 github.com/docker/cli v24.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
-github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
-github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
+github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
 github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -92,6 +96,8 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60=
+github.com/kardianos/service v1.2.2/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -112,8 +118,8 @@ github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlW
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -144,13 +150,13 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rhysd/actionlint v1.6.25 h1:0Is99a51w1iocdxKUzNYiBNwjoSlO2Klqzll98joVj4=
-github.com/rhysd/actionlint v1.6.25/go.mod h1:Q+MtZKm1MdmJ9woOSKxLscMW7kU44/PShvjNy5ZKHA8=
+github.com/rhysd/actionlint v1.6.26 h1:zi7jPZf3Ks14gCXYAAL47uBziyFlX7+Xwilqhexct9g=
+github.com/rhysd/actionlint v1.6.26/go.mod h1:TIj1DlCgtYLOv5CH9wCK+WJTOr1qAdnFzkGi0IgSCO4=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
-github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -161,8 +167,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM=
 github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
-github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -236,6 +242,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -249,15 +256,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -267,8 +274,10 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
+golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
--- a/internal/app/cmd/cmd.go
+++ b/internal/app/cmd/cmd.go
@@ -6,7 +6,9 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"gitea.com/gitea/act_runner/internal/pkg/helpers"
 	"os"
+	"os/user"

 	"github.com/spf13/cobra"

@@ -23,9 +25,16 @@ func Execute(ctx context.Context) {
 		Version:      ver.Version(),
 		SilenceUsage: true,
 	}
+
 	configFile := ""
 	rootCmd.PersistentFlags().StringVarP(&configFile, "config", "c", "", "Config file path")

+	workingDirectory := ""
+	rootCmd.PersistentFlags().StringVarP(&workingDirectory, "working-directory", "d", helpers.GetCurrentWorkingDirectory(), "Specify custom root directory where all data are stored")
+
+	daemonUser := ""
+	rootCmd.PersistentFlags().StringVarP(&daemonUser, "user", "u", getCurrentUserName(), "Specify user-name to run the daemon service as")
+
 	// ./act_runner register
 	var regArgs registerArgs
 	registerCmd := &cobra.Command{
@@ -45,11 +54,33 @@ func Execute(ctx context.Context) {
 	daemonCmd := &cobra.Command{
 		Use:   "daemon",
 		Short: "Run as a runner daemon",
-		Args:  cobra.MaximumNArgs(1),
-		RunE:  runDaemon(ctx, &configFile),
+		Args:  cobra.MaximumNArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return daemon(cmd, ctx, &configFile, &workingDirectory, &daemonUser)
+		},
 	}
 	rootCmd.AddCommand(daemonCmd)

+	// ./act_runner daemon install
+	installDaemonCmd := &cobra.Command{
+		Use:   "install",
+		Short: "Install the daemon",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return daemon(cmd, ctx, &configFile, &workingDirectory, &daemonUser)
+		},
+	}
+	daemonCmd.AddCommand(installDaemonCmd)
+
+	// ./act_runner daemon uninstall
+	uninstallDaemonCmd := &cobra.Command{
+		Use:   "uninstall",
+		Short: "Uninstall the daemon",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return daemon(cmd, ctx, &configFile, &workingDirectory, &daemonUser)
+		},
+	}
+	daemonCmd.AddCommand(uninstallDaemonCmd)
+
 	// ./act_runner exec
 	rootCmd.AddCommand(loadExecCmd(ctx))

@@ -83,3 +114,11 @@ func Execute(ctx context.Context) {
 		os.Exit(1)
 	}
 }
+
+func getCurrentUserName() string {
+	user, _ := user.Current()
+	if user != nil {
+		return user.Username
+	}
+	return ""
+}
--- a/internal/app/cmd/daemon.go
+++ b/internal/app/cmd/daemon.go
@@ -6,17 +6,19 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"github.com/bufbuild/connect-go"
+	"github.com/kardianos/service"
+	"github.com/mattn/go-isatty"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 	"os"
+	"os/signal"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
-
-	"github.com/bufbuild/connect-go"
-	"github.com/mattn/go-isatty"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
+	"syscall"

 	"gitea.com/gitea/act_runner/internal/app/poll"
 	"gitea.com/gitea/act_runner/internal/app/run"
@@ -27,22 +29,147 @@ import (
 	"gitea.com/gitea/act_runner/internal/pkg/ver"
 )

-func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
-	return func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.LoadDefault(*configFile)
+func daemon(cmd *cobra.Command, ctx context.Context, configFile *string, directory *string, daemonUser *string) error {
+	svc, err := svc(ctx, configFile, directory, daemonUser)
 	if err != nil {
-			return fmt.Errorf("invalid configuration: %w", err)
+		return err
+	}
+	serviceAction := cmd.Use
+	switch serviceAction {
+	case "install":
+		if err := svc.Install(); err != nil {
+			return err
+		}
+		return svc.Start()
+	case "uninstall":
+		if err := svc.Stop(); err != nil {
+			log.Println(err)
+		}
+		return svc.Uninstall()
+	default:
+		return svc.Run()
+	}
 }

+func svc(ctx context.Context, configFile *string, directory *string, daemonUser *string) (service.Service, error) {
+	/*
+	 * The following struct fields are used to set the service's Name,
+	 * Display name, description and Arguments only when service  gets
+	 * installed via the `admin-helper install-daemon` command for CRC
+	 * in production these values are not used as the MSI installs the
+	 * service
+	 */
+	svcConfig := &service.Config{
+		Name:        "act-runner",
+		DisplayName: "Gitea-CI runner",
+		Description: "Gitea CI runner written in GO",
+		Arguments:   []string{"daemon"},
+	}
+	svcConfig.Arguments = append(svcConfig.Arguments, "--working-directory", *directory)
+
+	if *configFile != "" {
+		svcConfig.Arguments = append(svcConfig.Arguments, "--config", *configFile)
+	} else {
+		configFile := filepath.Join(*directory, "config.yaml")
+		if _, err := os.Stat(configFile); os.IsNotExist(err) {
+			file, err := os.Create(configFile)
+			if err != nil {
+				log.Error("Error creating config.yaml:", err)
+				os.Exit(1)
+			}
+			defer file.Close()
+			_, err = file.Write(config.Example)
+			if err != nil {
+				log.Error("Error writing to config.yaml:", err)
+				os.Exit(1)
+			}
+		} else if err != nil {
+			log.Error("Error checking config.yaml:", err)
+			os.Exit(1)
+		}
+
+		svcConfig.Arguments = append(svcConfig.Arguments, "--config", configFile)
+	}
+
+	if runtime.GOOS == "linux" {
+		if os.Getuid() != 0 {
+			log.Fatal("The --user is not supported for non-root users")
+		}
+		if *daemonUser != "" {
+			svcConfig.UserName = *daemonUser
+		}
+	}
+
+	if runtime.GOOS == "darwin" {
+		svcConfig.EnvVars = map[string]string{
+			"PATH": "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/bin:/bin:/usr/sbin:/sbin",
+		}
+		svcConfig.Option = service.KeyValue{
+			"KeepAlive":   true,
+			"RunAtLoad":   true,
+			"UserService": os.Getuid() != 0,
+		}
+	}
+
+	prg := &program{
+		ctx:              ctx,
+		configFile:       configFile,
+		workingDirectory: directory,
+	}
+	return service.New(prg, svcConfig)
+}
+
+type program struct {
+	ctx              context.Context
+	configFile       *string
+	workingDirectory *string
+
+	// stopSignals is to catch a signals notified to process: SIGTERM, SIGQUIT, Interrupt, Kill
+	stopSignals chan os.Signal
+
+	// done channel to signal the completion of the run method
+	done chan struct{}
+}
+
+func (p *program) Start(s service.Service) error {
+	p.stopSignals = make(chan os.Signal)
+	p.done = make(chan struct{})
+
+	// Start should not block. Do the actual work async.
+	go p.run()
+	return nil
+}
+func (p *program) Stop(s service.Service) error {
+	close(p.stopSignals)
+	<-p.done // Wait for the run method to complete
+
+	// Stop should not block. Return with a few seconds.
+	return nil
+}
+
+func (p *program) run() {
+	signal.Notify(p.stopSignals, syscall.SIGQUIT, syscall.SIGTERM, os.Interrupt)
+	// Do work here
+	if err := os.Chdir(*p.workingDirectory); err != nil {
+		log.Error("error changing working directory:", err)
+		os.Exit(1)
+	}
+
+	cfg, err := config.LoadDefault(*p.configFile)
+	if err != nil {
+		log.Error("invalid configuration: %w", err)
+		os.Exit(1)
+	}
 	initLogging(cfg)
 	log.Infoln("Starting runner daemon")

 	reg, err := config.LoadRegistration(cfg.Runner.File)
 	if os.IsNotExist(err) {
 		log.Error("registration file not found, please register the runner first")
-			return err
+		os.Exit(1)
 	} else if err != nil {
-			return fmt.Errorf("failed to load registration file: %w", err)
+		log.Error("failed to load registration file: %w", err)
+		os.Exit(1)
 	}

 	lbls := reg.Labels
@@ -66,10 +193,12 @@ func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command,
 	if ls.RequireDocker() {
 		dockerSocketPath, err := getDockerSocketPath(cfg.Container.DockerHost)
 		if err != nil {
-				return err
+			log.Error(err)
+			return
 		}
-			if err := envcheck.CheckIfDockerRunning(ctx, dockerSocketPath); err != nil {
-				return err
+		if err := envcheck.CheckIfDockerRunning(p.ctx, dockerSocketPath); err != nil {
+			log.Error(err)
+			return
 		}
 		// if dockerSocketPath passes the check, override DOCKER_HOST with dockerSocketPath
 		os.Setenv("DOCKER_HOST", dockerSocketPath)
@@ -98,29 +227,30 @@ func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command,

 	runner := run.NewRunner(cfg, reg, cli)
 	// declare the labels of the runner before fetching tasks
-		resp, err := runner.Declare(ctx, ls.Names())
+	resp, err := runner.Declare(p.ctx, ls.Names())
 	if err != nil && connect.CodeOf(err) == connect.CodeUnimplemented {
 		// Gitea instance is older version. skip declare step.
 		log.Warn("Because the Gitea instance is an old version, skip declare labels and version.")
 	} else if err != nil {
 		log.WithError(err).Error("fail to invoke Declare")
-			return err
+		return
 	} else {
 		log.Infof("runner: %s, with version: %s, with labels: %v, declare successfully",
 			resp.Msg.Runner.Name, resp.Msg.Runner.Version, resp.Msg.Runner.Labels)
 		// if declare successfully, override the labels in the.runner file with valid labels in the config file (if specified)
 		reg.Labels = ls.ToStrings()
 		if err := config.SaveRegistration(cfg.Runner.File, reg); err != nil {
-				return fmt.Errorf("failed to save runner config: %w", err)
+			log.Error("failed to save runner config: %w", err)
+			return
 		}
 	}

 	poller := poll.New(cfg, cli, runner)
+	poller.Poll(p.ctx)

-		poller.Poll(ctx)
+	close(p.done) // Signal that the run method has completed

-		return nil
-	}
+	return
 }

 // initLogging setup the global logrus logger.
--- a/internal/pkg/config/config.go
+++ b/internal/pkg/config/config.go
@@ -88,6 +88,9 @@ func LoadDefault(file string) (*Config, error) {
 			if err != nil {
 				return nil, fmt.Errorf("read env file %q: %w", cfg.Runner.EnvFile, err)
 			}
+			if cfg.Runner.Envs == nil {
+				cfg.Runner.Envs = map[string]string{}
+			}
 			for k, v := range envs {
 				cfg.Runner.Envs[k] = v
 			}
--- a/internal/pkg/helpers/home_dir.go
+++ b/internal/pkg/helpers/home_dir.go
@@ -0,0 +1,19 @@
+package helpers
+
+import (
+	"os"
+
+	"github.com/docker/docker/pkg/homedir"
+)
+
+func GetCurrentWorkingDirectory() string {
+	dir, err := os.Getwd()
+	if err == nil {
+		return dir
+	}
+	return ""
+}
+
+func GetHomeDir() string {
+	return homedir.Get()
+}
--- a/renovate.json5
+++ b/renovate.json5
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>gitea/renovate-config"
+  ]
+}
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -6,6 +6,8 @@ fi

 cd /data

+RUNNER_STATE_FILE=${RUNNER_STATE_FILE:-'.runner'}
+
 CONFIG_ARG=""
 if [[ ! -z "${CONFIG_FILE}" ]]; then
  CONFIG_ARG="--config ${CONFIG_FILE}"
@@ -21,8 +23,9 @@ if [[ -z "${GITEA_RUNNER_REGISTRATION_TOKEN}" ]] && [[ -f "${GITEA_RUNNER_REGIST
 fi

 # Use the same ENV variable names as https://github.com/vegardit/docker-gitea-act-runner
+test -f "$RUNNER_STATE_FILE" || echo "$RUNNER_STATE_FILE is missing or not a regular file"

-if [[ ! -s .runner ]]; then
+if [[ ! -s "$RUNNER_STATE_FILE" ]]; then
  try=$((try + 1))
  success=0
Author	SHA1	Message	Date
cachito-worker	dc29a06ecd	Merge branch 'main' into main	2023-12-01 13:47:01 +00:00
Renovate Bot	8c8a8ce401	fix(deps): update module github.com/avast/retry-go/v4 to v4.5.1 (#411 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-28 05:46:05 +00:00
Renovate Bot	08c681be0c	fix(deps): update module golang.org/x/time to v0.5.0 (#429 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-28 05:45:28 +00:00
cachito-worker	c9ec99c632	feat: Add support for service on Windows, Linux, and macOS Introduce functionality to support the execution of the `act_runner` daemon as a service on various operating systems, including Windows, Linux, and macOS. This enhancement includes the ability to set the working directory using the `--working-directory` flag. Details: - The daemon can be installed and enabled with the command `act_runner daemon install`. - The service can be stopped and uninstalled using `act_runner daemon uninstall`. - The default working directory is set to the directory containing the `act_runner` executable. - During the installation process (`act_runner daemon install`), the service checks for the existence of `.runner` and `config.yaml` files in the same directory. If found, these files are loaded into the service. Note: Prior to running `act_runner daemon install`, ensure registration of `act_runner` with the command `act_runner register` to generate the required `.runner` file.	2023-11-28 01:45:18 +00:00
Renovate Bot	91bfe4c186	fix(deps): update module golang.org/x/time to v0.4.0 (#424 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-26 00:01:51 +00:00
Renovate Bot	825c6f97b7	fix(deps): update module github.com/mattn/go-isatty to v0.0.20 (#414 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 08:33:37 +00:00
Renovate Bot	2f3e5c7125	fix(deps): update module github.com/docker/docker to v24.0.7+incompatible (#413 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 08:27:38 +00:00
Renovate Bot	4d9de6ca8c	fix(deps): update module github.com/spf13/cobra to v1.8.0 (#416 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 08:27:07 +00:00
Renovate Bot	feb39666cc	fix(deps): update module code.gitea.io/gitea-vet to v0.2.3 (#410 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 08:26:24 +00:00
techknowlogick	61cd71c9f8	bump to actions/checkout v4	2023-11-24 03:06:21 +00:00
Renovate Bot	0adfc1c7cc	chore(deps): update actions/setup-go action to v4 (#418 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 03:05:33 +00:00
Renovate Bot	e3c68668fa	chore(deps): update docker/build-push-action action to v5 (#419 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 03:05:28 +00:00
Renovate Bot	f1b27d5274	chore(deps): update docker/login-action action to v3 (#420 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 03:05:22 +00:00
Renovate Bot	655a39fd61	chore(deps): update docker/setup-buildx-action action to v3 (#421 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 03:05:07 +00:00
Renovate Bot	cca7d54117	chore(deps): update docker/setup-qemu-action action to v3 (#422 ) Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>	2023-11-24 03:05:00 +00:00
infinoid	934471813a	Fix #404 : nil map error when reading env file (#405 ) Co-authored-by: Mark Glines <mark@glines.org> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/405 Reviewed-by: Jason Song <i@wolfogre.com> Co-authored-by: infinoid <infinoid@noreply.gitea.com> Co-committed-by: infinoid <infinoid@noreply.gitea.com>	2023-11-24 01:56:27 +00:00
pat-s	1e940f028b	Add renovate config (#408 ) + write access required for `renovate-bot` user Reviewed-on: https://gitea.com/gitea/act_runner/pulls/408 Reviewed-by: techknowlogick <techknowlogick@noreply.gitea.com> Co-authored-by: pat-s <patrick.schratz@gmail.com> Co-committed-by: pat-s <patrick.schratz@gmail.com>	2023-11-23 20:41:10 +00:00
lng2020	2020ce79bf	Remove ACTIONS_RUNTIME_TOKEN workaround (#396 ) The bug has been fixed for a long time in the GitHub version. The fix commit is `d8823bfaed` and released in the 4.0.0 and after. The issue also mentions that https://gitea.com/gitea/act_runner/issues/119#issuecomment-738294 Reviewed-on: https://gitea.com/gitea/act_runner/pulls/396 Reviewed-by: techknowlogick <techknowlogick@noreply.gitea.com> Co-authored-by: lng2020 <nanguanlin6@gmail.com> Co-committed-by: lng2020 <nanguanlin6@gmail.com>	2023-11-07 05:15:14 +00:00
Jason Song	00e9b3d62b	Bump act (#394 ) Bump act to follow https://gitea.com/gitea/act/pulls/81 Reviewed-on: https://gitea.com/gitea/act_runner/pulls/394 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>	2023-10-31 15:03:07 +00:00
haxwithaxe	130b9f1877	Added environment variable for run.sh to specify runner state file. (#377 ) Added environment variable `RUNNER_STATE_FILE` to let users specify where `run.sh` looks for the runner JSON file. Defaults to ``.runner`` to preserve the original behavior. Addresses issue #368. It's not my preferred solution but it's the least invasive one I can think of. I'm happy to make any changes you want. I didn't see an appropriate place to reference the change in the documentation. I will add documentation wherever you think is appropriate. To test this I did the following: * Built an image with the `make docker` command and pushed it to my private registry. * Added that private image as the image in my existing docker stack that was exhibiting the behavior described in #368. * Added the RUNNER_STATE_FILE environment variable pointing to the runner JSON file set in my `config.yml` (``/data/runner.json`` in this case). * Configured a new runner in gitea and added the token as an environment variable in the stack config. * Deployed the stack and verified the new runner was recognized (in the idle state). * Force updated the runner service to restart the container. * Verified the same runner was still recognized in gitea (in the idle state) once it was back up and running. Here is the relevant config. It's stored as a template so I've left the things that would normally be redacted as they are in the template. ``` runner: image: hub.hax.in.net/haxwithaxe/act_runner:dev1 networks: - swarm-net environment: RUNNER_STATE_FILE: /data/runner.json CONFIG_FILE: /data/config.yml GITEA_INSTANCE_URL: "https://git_gitea" GITEA_RUNNER_REGISTRATION_TOKEN: "{{ git_runner_reg_token }}" GITEA_RUNNER_NAME: "git_runner" volumes: - runner_data:/data - /var/run/docker.sock:/var/run/docker.sock ``` `runner_data` is a glusterfs subvolume Thanks for creating this gitea specific fork. Apart from the issue this pull request addresses it works so well I don't have to think about it once it's set up. Co-authored-by: haxwithaxe <spam@haxwithaxe.net> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/377 Co-authored-by: haxwithaxe <haxwithaxe@noreply.gitea.com> Co-committed-by: haxwithaxe <haxwithaxe@noreply.gitea.com>	2023-10-15 23:21:53 +00:00
vilunov	4c35288175	Add DIND docker-compose example (#365 ) Co-authored-by: Nikita Vilunov <nikita@vilunov.me> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/365 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: vilunov <vilunov@noreply.gitea.com> Co-committed-by: vilunov <vilunov@noreply.gitea.com>	2023-10-02 15:12:31 +00:00
Andrew Imeson	990db1bfc0	Fix k8s rootless Docker filesystem permissions (#366 ) Without this the deployment fails because the runner can't write to /data/ Credit to @ccureau for identifying the fix Relates to: gitea/act_runner#264 Reviewed-on: https://gitea.com/gitea/act_runner/pulls/366 Reviewed-by: techknowlogick <techknowlogick@noreply.gitea.com> Co-authored-by: Andrew Imeson <andrew@andrewimeson.com> Co-committed-by: Andrew Imeson <andrew@andrewimeson.com>	2023-10-02 15:12:14 +00:00