Add ubuntu-24.04 label to defaults. (#724 )

Simple change to include ubuntu-24.04 in the default list. While ubuntu-latest already points to the same image (at this time) it is appropriate to have it by version as well. Co-authored-by: techknowlogick <techknowlogick@gitea.com> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/724 Co-authored-by: telackey <telackey@noreply.gitea.com> Co-committed-by: telackey <telackey@noreply.gitea.com>
2025-07-22 14:47:30 +00:00
10 changed files with 21 additions and 34 deletions
--- a/.gitea/workflows/release-nightly.yml
+++ b/.gitea/workflows/release-nightly.yml
@@ -9,7 +9,6 @@ on:
 jobs:
  goreleaser:
    runs-on: ubuntu-latest
-    if: false # not implemented on this instance
    steps:
      - uses: actions/checkout@v4
        with:
@@ -36,6 +35,7 @@ jobs:
    container:
      image: catthehacker/ubuntu:act-latest
    env:
+      DOCKER_ORG: gitea
      DOCKER_LATEST: nightly
    steps:
      - name: Checkout
@@ -52,14 +52,12 @@ jobs:
      - name: Login to DockerHub
        uses: docker/login-action@v3
        with:
-          registry: ${{ github.server_url }}
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Get Meta
        id: meta
        run: |
-          echo REGISTRY=$(echo ${GITHUB_SERVER_URL} | awk -F[/:] '{print $4}') >> $GITHUB_ENV
          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
          echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT

@@ -74,7 +72,7 @@ jobs:
            linux/arm64
          push: true
          tags: |
-            ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }}
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

      - name: Build and push dind
        uses: docker/build-push-action@v5
@@ -100,4 +98,4 @@ jobs:
            linux/arm64
          push: true
          tags: |
-            ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }}-dind-rootless
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}-dind-rootless
--- a/.gitea/workflows/release-tag.yml
+++ b/.gitea/workflows/release-tag.yml
@@ -8,7 +8,6 @@ on:
 jobs:
  goreleaser:
    runs-on: ubuntu-latest
-    if: false # disabled as goreleaser is not implemented on my instance
    steps:
      - uses: actions/checkout@v4
        with:
@@ -43,6 +42,7 @@ jobs:
    container:
      image: catthehacker/ubuntu:act-latest
    env:
+      DOCKER_ORG: gitea
      DOCKER_LATEST: latest
    steps:
      - name: Checkout
@@ -59,14 +59,12 @@ jobs:
      - name: Login to DockerHub
        uses: docker/login-action@v3
        with:
-          registry: ${{ github.server_url }}
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Get Meta
        id: meta
        run: |
-          echo REGISTRY=$(echo ${GITHUB_SERVER_URL} | awk -F[/:] '{print $4}') >> $GITHUB_ENV
          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
          echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT

@@ -81,8 +79,8 @@ jobs:
            linux/arm64
          push: true
          tags: |
-            ${{ env.REGISTRY }}/${{ github.repository }}:${{ steps.meta.outputs.REPO_VERSION }}
-            ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }}
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

      - name: Build and push dind
        uses: docker/build-push-action@v5
@@ -109,5 +107,5 @@ jobs:
            linux/arm64
          push: true
          tags: |
-            ${{ env.REGISTRY }}/${{ github.repository }}:${{ steps.meta.outputs.REPO_VERSION }}-dind-rootless
-            ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.DOCKER_LATEST }}-dind-rootless
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-dind-rootless
+            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}-dind-rootless
--- a/9
+++ b/9
@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine3.22 AS builder
+FROM golang:1.24-alpine AS builder

 # Do not remove `git` here, it is required for getting runner version when executing `make build`
 RUN apk add --no-cache make git
@@ -11,8 +11,9 @@ WORKDIR /opt/src/act_runner

 RUN make clean && make build

-FROM alpine:3.22
-RUN apk add --no-cache git bash tini
+FROM docker:dind AS dind
+
+RUN apk add --no-cache s6 bash git

 COPY --from=builder /opt/src/act_runner/act_runner /usr/local/bin/act_runner
 COPY scripts/run.sh /usr/local/bin/run.sh
@@ -40,7 +41,7 @@ ENV DOCKER_HOST=unix:///run/user/1000/docker.sock
 USER rootless
 ENTRYPOINT ["s6-svscan","/etc/s6"]

-FROM alpine:3.22 AS basic
+FROM alpine AS basic
 RUN apk add --no-cache tini bash git

 COPY --from=builder /opt/src/act_runner/act_runner /usr/local/bin/act_runner
--- a/go.mod
+++ b/go.mod
@@ -98,7 +98,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

-// replace github.com/nektos/act => gitea.com/gitea/act v0.261.4
-replace github.com/nektos/act => gitea.krombel.de/krombel/act v0.261.6-1
+replace github.com/nektos/act => gitea.com/gitea/act v0.261.4

 replace github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.16.2
--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,8 @@ connectrpc.com/connect v1.16.2 h1:ybd6y+ls7GOlb7Bh5C8+ghA6SvCBajHwxssO2CGFjqE=
 connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz5FRc=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-gitea.krombel.de/krombel/act v0.261.6-1 h1:aIouPZ9MlGOOfvXpXBzUmBZ76679uJfUWda/i/paVwQ=
-gitea.krombel.de/krombel/act v0.261.6-1/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok=
+gitea.com/gitea/act v0.261.4 h1:Tf9eLlvsYFtKcpuxlMvf9yT3g4Hshb2Beqw6C1STuH8=
+gitea.com/gitea/act v0.261.4/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
--- a/internal/app/cmd/cache-server.go
+++ b/internal/app/cmd/cache-server.go
@@ -17,10 +17,9 @@ import (
 )

 type cacheServerArgs struct {
-	Dir          string
-	AdvertiseUrl string
-	Host         string
-	Port         uint16
+	Dir  string
+	Host string
+	Port uint16
 }

 func runCacheServer(ctx context.Context, configFile *string, cacheArgs *cacheServerArgs) func(cmd *cobra.Command, args []string) error {
@@ -34,7 +33,6 @@ func runCacheServer(ctx context.Context, configFile *string, cacheArgs *cacheSer

 		var (
 			dir  = cfg.Cache.Dir
-			url  = cfg.Cache.AdvertiseUrl
 			host = cfg.Cache.Host
 			port = cfg.Cache.Port
 		)
@@ -43,9 +41,6 @@ func runCacheServer(ctx context.Context, configFile *string, cacheArgs *cacheSer
 		if cacheArgs.Dir != "" {
 			dir = cacheArgs.Dir
 		}
-		if cacheArgs.AdvertiseUrl != "" {
-			url = cacheArgs.AdvertiseUrl
-		}
 		if cacheArgs.Host != "" {
 			host = cacheArgs.Host
 		}
@@ -55,7 +50,6 @@ func runCacheServer(ctx context.Context, configFile *string, cacheArgs *cacheSer

 		cacheHandler, err := artifactcache.StartHandler(
 			dir,
-			url,
 			host,
 			port,
 			log.StandardLogger().WithField("module", "cache_request"),
--- a/internal/app/cmd/exec.go
+++ b/internal/app/cmd/exec.go
@@ -368,7 +368,7 @@ func runExec(ctx context.Context, execArgs *executeArgs) func(cmd *cobra.Command
 		}

 		// init a cache server
-		handler, err := artifactcache.StartHandler("", "", "", 0, log.StandardLogger().WithField("module", "cache_request"))
+		handler, err := artifactcache.StartHandler("", "", 0, log.StandardLogger().WithField("module", "cache_request"))
 		if err != nil {
 			return err
 		}
--- a/internal/app/cmd/register.go
+++ b/internal/app/cmd/register.go
@@ -93,8 +93,8 @@ const (

 var defaultLabels = []string{
 	"ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest",
+	"ubuntu-24.04:docker://docker.gitea.com/runner-images:ubuntu-24.04",
 	"ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04",
-	"ubuntu-20.04:docker://docker.gitea.com/runner-images:ubuntu-20.04",
 }

 type registerInputs struct {
--- a/internal/app/run/runner.go
+++ b/internal/app/run/runner.go
@@ -58,7 +58,6 @@ func NewRunner(cfg *config.Config, reg *config.Registration, cli client.Client)
 		} else {
 			cacheHandler, err := artifactcache.StartHandler(
 				cfg.Cache.Dir,
-				cfg.Cache.AdvertiseUrl,
 				cfg.Cache.Host,
 				cfg.Cache.Port,
 				log.StandardLogger().WithField("module", "cache_request"),
@@ -157,7 +156,6 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
 		Token:           taskContext["token"].GetStringValue(),
 		RepositoryOwner: taskContext["repository_owner"].GetStringValue(),
 		RetentionDays:   taskContext["retention_days"].GetStringValue(),
-		ServerURL:       taskContext["server_url"].GetStringValue(),
 	}
 	if t := task.Secrets["GITEA_TOKEN"]; t != "" {
 		preset.Token = t
--- a/internal/pkg/config/config.go
+++ b/internal/pkg/config/config.go
@@ -38,7 +38,6 @@ type Cache struct {
 	Enabled        *bool  `yaml:"enabled"`         // Enabled indicates whether caching is enabled. It is a pointer to distinguish between false and not set. If not set, it will be true.
 	Dir            string `yaml:"dir"`             // Dir specifies the directory path for caching.
 	Host           string `yaml:"host"`            // Host specifies the caching host.
-	AdvertiseUrl   string `yaml:"advertise_url"`   // Host specifies the caching host.
 	Port           uint16 `yaml:"port"`            // Port specifies the caching port.
 	ExternalServer string `yaml:"external_server"` // ExternalServer specifies the URL of external cache server
 }