Skip to content

Commit

Permalink
Merge pull request #193 from lenny-intel/go-1.21
Browse files Browse the repository at this point in the history
build: Upgrade to go-1.21, Linter1.54.2 and Alpine 3.18
  • Loading branch information
Lenny Goodell authored Sep 12, 2023
2 parents 20941c5 + ef55be4 commit bc7e525
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit bc7e525

Please sign in to comment.