From d4eb91353372a54f4d7600a494c6fefff388b43d Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Tue, 30 May 2023 11:47:06 +0200
Subject: [PATCH] [FORGEJO] use alpine 3.18

Refs: https://github.com/nektos/act/issues/1908

Bump Docker dependency

See https://code.forgejo.org/forgejo/act/pulls/9 for more info.

Use forked act change branch

Bump version

Use forgejo fork v1.9.0

Revert #50

Now that https://code.forgejo.org/forgejo/runner/pulls/64 has been
merged we should be good to go.

Remove pinned go version in test workflow

Bump Go version to 1.21
---
 .forgejo/workflows/integration.yml | 1 +
 .forgejo/workflows/test.yml        | 3 +--
 Dockerfile                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml
index 55907cb..895a4dc 100644
--- a/.forgejo/workflows/integration.yml
+++ b/.forgejo/workflows/integration.yml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - go.mod
+      - Dockerfile
       - .forgejo/workflows/release.yml
       - .forgejo/workflows/integration.yml
 
diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
index 48cca2a..aee2927 100644
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@@ -36,8 +36,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          # pin because of https://github.com/nektos/act/issues/1908
-          go-version: 1.20.5
+          go-version: '1.21'
 
       - uses: actions/checkout@v3
 
diff --git a/Dockerfile b/Dockerfile
index 0fdae4a..49cf77b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 #Build stage
-FROM golang:1.20-alpine3.17 AS build-env
+FROM golang:1.21-alpine3.18 AS build-env
 
 RUN apk --no-cache add build-base git
 
@@ -7,7 +7,7 @@ COPY . /srv
 WORKDIR /srv
 RUN make build
 
-FROM alpine:3.17
+FROM alpine:3.18
 LABEL maintainer="contact@forgejo.org"
 
 COPY --from=build-env /srv/forgejo-runner /bin/forgejo-runner