diff --git a/Dockerfile b/Dockerfile index 2ff88f3f..73604e84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. # -ARG BASE=golang:1.20-alpine3.17 +ARG BASE=golang:1.21-alpine3.18 FROM ${BASE} AS builder ARG ADD_BUILD_TAGS="" @@ -36,7 +36,7 @@ COPY . . RUN ${MAKE} # Next image - Copy built Go binary into new workspace -FROM alpine:3.17 +FROM alpine:3.18 LABEL license='SPDX-License-Identifier: Apache-2.0' \ copyright='Copyright (c) 2021: Jiangxing Intelligence' diff --git a/Makefile b/Makefile index 591653f6..00544043 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,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://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.51.2 + sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.54.2 test: unittest lint go vet ./... diff --git a/go.mod b/go.mod index 7aeaa127..b2a7ba50 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/edgexfoundry/device-gpio -go 1.20 +go 1.21 require ( github.com/edgexfoundry/device-sdk-go/v3 v3.1.0-dev.20