diff --git a/Dockerfile b/Dockerfile index afe19950..6bd5f395 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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. @@ -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="" @@ -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 diff --git a/Makefile b/Makefile index 436f82f7..db33b08a 100644 --- a/Makefile +++ b/Makefile @@ -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 ./... diff --git a/go.mod b/go.mod index 4755175b..019fa229 100644 --- a/go.mod +++ b/go.mod @@ -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