Skip to content

Commit

Permalink
build: Upgrade to go-1.21, Linter1.54.2 and Alpine 3.18
Browse files Browse the repository at this point in the history
Signed-off-by: Leonard Goodell <[email protected]>
  • Loading branch information
Leonard Goodell committed Sep 12, 2023
1 parent 46c2a4d commit a8ab136
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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 @@ -38,10 +38,10 @@ RUN ${MAKE}

FROM aler9/rtsp-simple-server:v0.21.6 AS rtsp

FROM alpine:3.17
FROM alpine:3.18

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

# dumb-init needed for injected secure bootstrapping entrypoint script when run in secure mode.
RUN apk add --update --no-cache dumb-init ffmpeg udev
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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-usb-camera

go 1.20
go 1.21

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

0 comments on commit a8ab136

Please sign in to comment.