aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortechknowlogick <techknowlogick@gitea.io>2023-08-20 18:27:46 -0400
committerGitHub <noreply@github.com>2023-08-21 00:27:46 +0200
commit653e77fd228f1ddb6e11ff289cfcc99680d7b111 (patch)
tree7cbca76c9eb144177e7d9f670fe1b4440e9be4d6
parent9c80a5d508c138bef6692cc566df7732a75a177d (diff)
downloadgitea-653e77fd228f1ddb6e11ff289cfcc99680d7b111.tar.gz
gitea-653e77fd228f1ddb6e11ff289cfcc99680d7b111.zip
bump go to 1.21 (#26608)
Co-authored-by: Giteabot <teabot@gitea.io>
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.rootless2
-rw-r--r--Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 06481cdf5a..b42b4daa5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
#Build stage
-FROM docker.io/library/golang:1.20-alpine3.18 AS build-env
+FROM docker.io/library/golang:1.21-alpine3.18 AS build-env
ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index aa74d35987..449e630fad 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -1,5 +1,5 @@
#Build stage
-FROM docker.io/library/golang:1.20-alpine3.18 AS build-env
+FROM docker.io/library/golang:1.21-alpine3.18 AS build-env
ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
diff --git a/Makefile b/Makefile
index 167f56c6b9..1100b9a621 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ SHASUM ?= shasum -a 256
HAS_GO := $(shell hash $(GO) > /dev/null 2>&1 && echo yes)
COMMA := ,
-XGO_VERSION := go-1.20.x
+XGO_VERSION := go-1.21.x
AIR_PACKAGE ?= github.com/cosmtrek/air@v1.44.0
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.7.0