Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Upgrade to go-1.21, Linter1.54.2 and Alpine 3.18 #340

Merged
merged 1 commit into from
Sep 12, 2023
Merged

build: Upgrade to go-1.21, Linter1.54.2 and Alpine 3.18 #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
# Copyright (c) 2021 IOTech Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,7 +15,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 @@ -33,10 +33,10 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
COPY . .
RUN $MAKE

FROM alpine:3.17
FROM alpine:3.18

LABEL license='SPDX-License-Identifier: Apache-2.0' \
copyright='Copyright (c) 2022: Intel'
copyright='Copyright (c) 2023: Intel'

LABEL Name=device-rest-go Version=${VERSION}

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/edgexfoundry/device-rest-go

go 1.20
go 1.21

require (
github.com/edgexfoundry/device-sdk-go/v3 v3.1.0-dev.20
Expand Down