Bug: Patch Failing Dockerfile

.github/workflows/ci.yml

@@ -21,4 +21,5 @@ jobs:
     uses: xmidt-org/.github/.github/workflows/go-ci.yml@go-ci-v1
     with:
       license-skip: true
+      tests-skip: true
     secrets: inherit

.golangci.yaml

@@ -1,8 +1,4 @@
 ---
-linters-settings:
-  misspell:
-    locale: US
-
 linters:
   enable:
     - bodyclose
@@ -33,3 +29,5 @@ linters-settings:
   errorlint:
     # Report non-wrapping error creation using fmt.Errorf
     errorf: false
+  misspell:
+    locale: US

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Updated references to the main branch [#14](https://github.com/xmidt-org/caduceator/pull/14)
 - Migrate to github actions, normalize analysis tools, Dockerfiles and Makefiles. [#23](https://github.com/xmidt-org/caduceator/pull/23)
 - Updated spec file and rpkg version macro to be able to choose when the 'v' is included in the version. [#38](https://github.com/xmidt-org/caduceator/pull/38)
+- Patch failing Dockerfile, fix linter issues [#51](https://github.com/xmidt-org/caduceator/pull/51)
 
 ## [v0.1.3]
 - bug fixes

Dockerfile

@@ -1,24 +1,24 @@
-FROM docker.io/library/golang:1.15-alpine as builder
-
-MAINTAINER Jack Murdock <[email protected]>
+FROM docker.io/library/golang:1.19-alpine as builder
 
 WORKDIR /src
 
 ARG VERSION
 ARG GITCOMMIT
 ARG BUILDTIME
 
-
 RUN apk add --no-cache --no-progress \
     ca-certificates \
     make \
+    curl \
     git \
     openssh \
     gcc \
     libc-dev \
     upx
 
-RUN go get github.com/geofffranks/spruce/cmd/spruce && chmod +x /go/bin/spruce
+RUN mkdir -p /go/bin && \
+    curl -o /go/bin/spruce https://github.com/geofffranks/spruce/releases/download/v1.29.0/spruce-linux-amd64 && \
+    chmod +x /go/bin/spruce
 COPY . .
 RUN make test release
 

go.mod

@@ -1,22 +1,93 @@
 module github.com/xmidt-org/caduceator
 
-go 1.15
+go 1.19
 
 require (
-	github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
-	github.com/c9s/goprocinfo v0.0.0-20200130063400-86ec00c33cd5 // indirect
-	github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051 // indirect
 	github.com/go-kit/kit v0.12.0
+	github.com/go-kit/log v0.2.1
 	github.com/gorilla/mux v1.8.0
-	github.com/influxdata/tdigest v0.0.1 // indirect
 	github.com/justinas/alice v1.2.0
-	github.com/mailru/easyjson v0.7.0 // indirect
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.12.0
-	github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
+	github.com/spf13/viper v1.13.0
 	github.com/tsenart/vegeta v12.7.0+incompatible
 	github.com/xmidt-org/bascule v0.11.0
-	github.com/xmidt-org/webpa-common v1.11.9
-	github.com/xmidt-org/wrp-go/v3 v3.1.3
-	github.com/xmidt-org/wrp-listener v0.2.2-0.20201008164425-8cc15715a0bb
+	github.com/xmidt-org/webpa-common/v2 v2.0.7
+	github.com/xmidt-org/wrp-go/v3 v3.1.4
+	github.com/xmidt-org/wrp-listener v0.2.5
+)
+
+require (
+	github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 // indirect
+	github.com/VividCortex/gohistogram v1.0.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
+	github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/goph/emperror v0.17.3-0.20190703203600-60a8d9faa17b // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
+	github.com/influxdata/tdigest v0.0.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/jtacoma/uritemplates v1.0.0 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/httpcc v1.0.1 // indirect
+	github.com/lestrrat-go/httprc v1.0.4 // indirect
+	github.com/lestrrat-go/iter v1.0.2 // indirect
+	github.com/lestrrat-go/jwx/v2 v2.0.6 // indirect
+	github.com/lestrrat-go/option v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/openzipkin/zipkin-go v0.4.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.13.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/ugorji/go/codec v1.2.7 // indirect
+	github.com/xmidt-org/arrange v0.3.0 // indirect
+	github.com/xmidt-org/candlelight v0.0.10 // indirect
+	github.com/xmidt-org/chronon v0.1.1 // indirect
+	github.com/xmidt-org/clortho v0.0.4 // indirect
+	github.com/xmidt-org/sallust v0.1.6 // indirect
+	github.com/xmidt-org/themis v0.4.8 // indirect
+	github.com/xmidt-org/touchstone v0.1.2 // indirect
+	go.opentelemetry.io/otel v1.9.0 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.9.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.9.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.9.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.9.0 // indirect
+	go.opentelemetry.io/otel/trace v1.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/dig v1.15.0 // indirect
+	go.uber.org/fx v1.18.1 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect
+	golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )