Merge pull request #679 from weichou1229/go-1.23

build: Upgrade to go-1.23, Linter1.61.0 and Alpine 3.20
edgexfoundry · Oct 8, 2024 · fcc305f · fcc305f
2 parents a0dcfaf + b97eeb4
commit fcc305f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/Attribution.txt b/Attribution.txt
@@ -423,3 +423,32 @@ https://github.com/googleapis/go-genproto/blob/main/LICENSE
 nhooyr.io/websocket (ISC License) - https://github.com/nhooyr/websocket
 https://github.com/nhooyr/websocket/blob/master/LICENSE.txt
 
+github.com/barkimedes/go-deepcopy (MIT) https://github.com/barkimedes/go-deepcopy
+https://github.com/barkimedes/go-deepcopy/blob/master/LICENSE
+
+github.com/go-jose/go-jose/v4 (Apache-2.0) https://github.com/go-jose/go-jose
+https://github.com/go-jose/go-jose/blob/main/LICENSE
+
+github.com/jackc/pgerrcode (MIT) https://github.com/jackc/pgerrcode
+https://github.com/jackc/pgerrcode/blob/master/LICENSE
+
+github.com/jackc/pgpassfile (MIT) https://github.com/jackc/pgpassfile
+https://github.com/jackc/pgpassfile/blob/master/LICENSE
+
+github.com/jackc/pgservicefile (MIT) https://github.com/jackc/pgservicefile
+https://github.com/jackc/pgservicefile/blob/master/LICENSE
+
+github.com/jackc/pgx/v5 (MIT) https://github.com/jackc/pgx
+https://github.com/jackc/pgx/blob/master/LICENSE
+
+github.com/jackc/puddle/v2 (MIT) https://github.com/jackc/puddle
+https://github.com/jackc/puddle/blob/master/LICENSE
+
+github.com/openziti/channel/v3 (Apache 2.0) - github.com/openziti/channel/v3
+https://github.com/openziti/channel/blob/main/LICENSE
+
+spf13/cast (MIT) https://github.com/spf13/cast
+https://github.com/spf13/cast/blob/master/LICENSE
+
+gopkg.in/go-jose/go-jose.v2 (Apache 2.0) - https://github.com/go-jose/go-jose
+https://github.com/go-jose/go-jose/blob/v2.6.3/LICENSE
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@
 #
 
 #build stage
-ARG BASE=golang:1.21-alpine3.18
+ARG BASE=golang:1.23-alpine3.20
 FROM ${BASE} AS builder
 
 ARG ALPINE_PKG_BASE="make git"
@@ -34,7 +34,7 @@ ARG MAKE="make -e ADD_BUILD_TAGS=$ADD_BUILD_TAGS build"
 RUN $MAKE
 
 #final stage
-FROM alpine:3.18
+FROM alpine:3.20
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
   copyright='Copyright (c) 2023: Intel'
 LABEL Name=app-service-configurable Version=${VERSION}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/edgexfoundry/app-service-configurable
 
-go 1.21
+go 1.23
 
 require github.com/edgexfoundry/app-functions-sdk-go/v3 v3.2.0-dev.52
 

diff --git a/makefile b/makefile
@@ -47,7 +47,7 @@ lint:
 	@if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi
 
 install-lint:
-	sudo curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.54.2
+	sudo curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.61.0
 
 unittest:
 	go test $(GOTESTFLAGS) -coverprofile=coverage.out ./...