From 0622381c21af6f6444497301eb56c7a02bb0ce9c Mon Sep 17 00:00:00 2001 From: Patrick Brueckner Date: Thu, 4 Jan 2024 22:50:12 +0100 Subject: [PATCH] update go runtime to 1.21 --- .github/workflows/ci.yml | 4 ++-- Dockerfile | 4 ++-- Makefile | 4 ++-- README.md | 2 +- go.mod | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63cc7f4..c43d93b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - name: Set up Go 1.17 + - name: Set up Go 1.21 uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.21 id: go - name: Check out code into the Go module directory diff --git a/Dockerfile b/Dockerfile index ed8af81..b344a0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17-alpine as app-builder +FROM golang:1.21-alpine as app-builder ENV SRC_DIR /s3proxy WORKDIR $SRC_DIR @@ -14,7 +14,7 @@ COPY . ./ RUN apk add build-base curl && make -FROM golang:1.17-alpine as lib-builder +FROM golang:1.21-alpine as lib-builder WORKDIR /root RUN apk add git diff --git a/Makefile b/Makefile index 6072d25..ef1b15e 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,13 @@ GOFILES = $(shell find . -type f -name '*.go' -not -path "./vendor/*") default: build build: clean - go build -i -v ${LDFLAGS} -o ${NAME} + go build -v ${LDFLAGS} -o ${NAME} clean: if [ -f "${NAME}" ] ; then rm ${NAME} ; fi lint: - docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v1.46.2 golangci-lint run -v + docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v1.55.2 golangci-lint run -v fmtcheck: tools.goimports @echo "--> checking code formatting with 'goimports' tool" diff --git a/README.md b/README.md index 7edcd3b..63e751b 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ This presigned URL has a duration period and can be used by any basic HTTP clien ## Requirements * Docker version 17.12.0+ -* Go 1.17+ +* Go 1.21+ ## Build diff --git a/go.mod b/go.mod index cda9914..e2e325f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mirakl/s3proxy -go 1.17 +go 1.21 require ( github.com/aws/aws-sdk-go v1.42.53