diff --git a/.drone.star b/.drone.star index 2bcddfcbc6..a72f088b41 100644 --- a/.drone.star +++ b/.drone.star @@ -1,5 +1,5 @@ # images -OC_CI_GOLANG = "owncloudci/golang:1.24" +OC_CI_GOLANG = "owncloudci/golang:1.25" OC_CI_ALPINE = "owncloudci/alpine:latest" OSIXIA_OPEN_LDAP = "osixia/openldap:1.3.0" REDIS = "redis:6-alpine" diff --git a/Dockerfile.reva b/Dockerfile.reva index 93c3870cad..8e7b61aa7f 100644 --- a/Dockerfile.reva +++ b/Dockerfile.reva @@ -16,7 +16,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -FROM golang:1.22-alpine3.19 as builder +FROM owncloudci/golang:1.25 as builder RUN apk --no-cache add \ ca-certificates \ diff --git a/Dockerfile.revad b/Dockerfile.revad index b30eb6f794..42476c3b79 100644 --- a/Dockerfile.revad +++ b/Dockerfile.revad @@ -16,7 +16,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -FROM golang:1.22-alpine3.19 as builder +FROM owncloudci/golang:1.25 as builder RUN apk --no-cache add \ ca-certificates \ @@ -36,7 +36,7 @@ RUN make build-revad-docker && \ RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml -FROM golang:1.22-alpine3.19 +FROM owncloudci/golang:1.25 RUN apk --no-cache add \ mailcap diff --git a/Dockerfile.revad-eos b/Dockerfile.revad-eos index 0d126d6c0a..24853df0f7 100644 --- a/Dockerfile.revad-eos +++ b/Dockerfile.revad-eos @@ -16,7 +16,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -FROM golang:1.22-alpine3.19 as builder +FROM owncloudci/golang:1.25 as builder RUN apk --no-cache add \ bash \ diff --git a/changelog/unreleased/bump-go-1.25.6.md b/changelog/unreleased/bump-go-1.25.6.md new file mode 100644 index 0000000000..39bc04b325 --- /dev/null +++ b/changelog/unreleased/bump-go-1.25.6.md @@ -0,0 +1,5 @@ +Enhancement: Update to go 1.25.6 + +We have updated go to version 1.25.6 and alpine to version 3.23.3 + +https://github.com/owncloud/reva/pull/525 diff --git a/go.mod b/go.mod index 563a2f7505..a32300eab1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/owncloud/reva/v2 -go 1.24.0 +go 1.25 require ( bou.ke/monkey v1.0.2