build: Latest go-mods, config and Dockerfile fix (#4217)

* build: Latest go-mods, config and Dockerfile fix Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
edgexfoundry · Oct 25, 2022 · 8ec1737 · 8ec1737
1 parent 9e55492
commit 8ec1737
Show file tree

Hide file tree

Showing 20 changed files with 15 additions and 58 deletions.
diff --git a/cmd/core-command/Dockerfile b/cmd/core-command/Dockerfile
@@ -23,11 +23,6 @@ ARG ADD_BUILD_TAGS=""
 
 WORKDIR /edgex-go
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git
 
 COPY go.mod vendor* ./

diff --git a/cmd/core-command/res/configuration.toml b/cmd/core-command/res/configuration.toml
@@ -23,6 +23,7 @@ LogLevel = "INFO"
   Interval = "30s"
   PublishTopicPrefix  = "edgex/telemetry" # /<service-name>/<metric-name> will be added to this Publish Topic prefix
     [Writable.Telemetry.Metrics] # All service's metric names must be present in this list.
+    # Common Security Service Metrics
     SecuritySecretsRequested = false
     SecuritySecretsStored = false
     SecurityConsulTokensRequested = false

diff --git a/cmd/core-data/Dockerfile b/cmd/core-data/Dockerfile
@@ -24,11 +24,6 @@ ARG ADD_BUILD_TAGS=""
 
 WORKDIR /edgex-go
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache zeromq-dev libsodium-dev pkgconfig build-base git
 
 COPY go.mod vendor* ./
@@ -47,10 +42,6 @@ ENV APP_PORT=59880
 #expose core data port
 EXPOSE $APP_PORT
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache zeromq dumb-init
 COPY --from=builder /edgex-go/Attribution.txt /
 COPY --from=builder /edgex-go/cmd/core-data/core-data /

diff --git a/cmd/core-data/res/configuration.toml b/cmd/core-data/res/configuration.toml
@@ -13,8 +13,10 @@ LogLevel = "INFO"
   Interval = "30s"
   PublishTopicPrefix  = "edgex/telemetry" # /<service-name>/<metric-name> will be added to this Publish Topic prefix
     [Writable.Telemetry.Metrics] # All service's metric names must be present in this list.
+    # Core Data Service Metrics
     EventsPersisted = false
     ReadingsPersisted = false
+    # Common Security Service Metrics
     SecuritySecretsRequested = false
     SecuritySecretsStored = false
     SecurityConsulTokensRequested = false

diff --git a/cmd/core-metadata/Dockerfile b/cmd/core-metadata/Dockerfile
@@ -23,11 +23,6 @@ ARG ADD_BUILD_TAGS=""
 
 WORKDIR /edgex-go
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git
 
 COPY go.mod vendor* ./

diff --git a/cmd/core-metadata/res/configuration.toml b/cmd/core-metadata/res/configuration.toml
@@ -20,6 +20,7 @@ LogLevel = "INFO"
   Interval = "30s"
   PublishTopicPrefix  = "edgex/telemetry" # /<service-name>/<metric-name> will be added to this Publish Topic prefix
     [Writable.Telemetry.Metrics] # All service's metric names must be present in this list.
+    # Common Security Service Metrics
     SecuritySecretsRequested = false
     SecuritySecretsStored = false
     SecurityConsulTokensRequested = false

diff --git a/cmd/security-bootstrapper/Dockerfile b/cmd/security-bootstrapper/Dockerfile
@@ -22,8 +22,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git
 
 COPY go.mod vendor* ./

diff --git a/cmd/security-proxy-setup/Dockerfile b/cmd/security-proxy-setup/Dockerfile
@@ -21,8 +21,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git
 
 COPY go.mod vendor* ./

diff --git a/cmd/security-secretstore-setup/Dockerfile b/cmd/security-secretstore-setup/Dockerfile
@@ -21,8 +21,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git
 
 COPY go.mod vendor* ./

diff --git a/cmd/security-spiffe-token-provider/Dockerfile b/cmd/security-spiffe-token-provider/Dockerfile
@@ -35,7 +35,6 @@ FROM alpine:3.15
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
       copyright='Copyright (c) 2022 Intel Corporation'
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
 RUN apk update && apk --no-cache --update add dumb-init curl gcompat
 
 COPY --from=builder /edgex-go/Attribution.txt /

diff --git a/cmd/security-spire-agent/Dockerfile b/cmd/security-spire-agent/Dockerfile
@@ -21,8 +21,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git build-base curl
 
 COPY go.mod vendor* ./
@@ -51,7 +49,6 @@ FROM alpine:3.15
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
       copyright='Copyright (c) 2022 Intel Corporation'
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
 RUN apk update && apk --no-cache --update add dumb-init openssl gcompat
 
 COPY --from=builder /usr/local/bin/spire-agent /usr/local/bin

diff --git a/cmd/security-spire-config/Dockerfile b/cmd/security-spire-config/Dockerfile
@@ -21,8 +21,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git build-base curl
 
 COPY go.mod vendor* ./
@@ -51,7 +49,6 @@ FROM alpine:3.15
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
       copyright='Copyright (c) 2022 Intel Corporation'
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
 RUN apk update && apk --no-cache --update add dumb-init gcompat
 
 COPY --from=builder /usr/local/bin/spire-server /usr/local/bin

diff --git a/cmd/security-spire-server/Dockerfile b/cmd/security-spire-server/Dockerfile
@@ -21,8 +21,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git build-base curl
 
 COPY go.mod vendor* ./
@@ -51,7 +49,6 @@ FROM alpine:3.15
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
       copyright='Copyright (c) 2022 Intel Corporation'
 
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
 RUN apk update && apk --no-cache --update add dumb-init openssl gcompat
 
 COPY --from=builder /usr/local/bin/spire-server /usr/local/bin

diff --git a/cmd/support-notifications/Dockerfile b/cmd/support-notifications/Dockerfile
@@ -22,11 +22,6 @@ ARG ADD_BUILD_TAGS=""
 
 WORKDIR /edgex-go
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make bash git ca-certificates
 
 COPY go.mod vendor* ./

diff --git a/cmd/support-notifications/res/configuration.toml b/cmd/support-notifications/res/configuration.toml
@@ -22,6 +22,7 @@ ResendInterval = "5s"
   Interval = "30s"
   PublishTopicPrefix  = "edgex/telemetry" # /<service-name>/<metric-name> will be added to this Publish Topic prefix
     [Writable.Telemetry.Metrics] # All service's metric names must be present in this list.
+    # Common Security Service Metrics
     SecuritySecretsRequested = false
     SecuritySecretsStored = false
     SecurityConsulTokensRequested = false

diff --git a/cmd/support-scheduler/Dockerfile b/cmd/support-scheduler/Dockerfile
@@ -23,11 +23,6 @@ ARG ADD_BUILD_TAGS=""
 
 WORKDIR /edgex-go
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make git
 
 COPY go.mod vendor* ./

diff --git a/cmd/support-scheduler/res/configuration.toml b/cmd/support-scheduler/res/configuration.toml
@@ -17,6 +17,7 @@ LogLevel = "INFO"
   Interval = "30s"
   PublishTopicPrefix  = "edgex/telemetry" # /<service-name>/<metric-name> will be added to this Publish Topic prefix
     [Writable.Telemetry.Metrics] # All service's metric names must be present in this list.
+    # Common Security Service Metrics
     SecuritySecretsRequested = false
     SecuritySecretsStored = false
     SecurityConsulTokensRequested = false

diff --git a/cmd/sys-mgmt-agent/Dockerfile b/cmd/sys-mgmt-agent/Dockerfile
@@ -10,10 +10,6 @@ FROM ${BUILDER_BASE} AS builder
 
 WORKDIR /edgex-go
 
-# The main mirrors are giving us timeout issues on builds periodically.
-# So we can try these.
-RUN sed -e 's/dl-cdn[.]alpinelinux.org/dl-4.alpinelinux.org/g' -i~ /etc/apk/repositories
-
 RUN apk add --update --no-cache make bash git
 
 COPY go.mod vendor* ./

diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/edgexfoundry/edgex-go
 require (
 	bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
 	github.com/eclipse/paho.mqtt.golang v1.4.1
-	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0-dev.24
+	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0-dev.26
 	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.3.0-dev.18
 	github.com/edgexfoundry/go-mod-messaging/v2 v2.3.0-dev.24
 	github.com/edgexfoundry/go-mod-registry/v2 v2.3.0-dev.11
-	github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0-dev.9
+	github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0-dev.10
 	github.com/fxamacker/cbor/v2 v2.4.0
 	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/gomodule/redigo v1.8.9
@@ -28,7 +28,7 @@ require (
 	github.com/armon/go-metrics v0.3.10 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0-dev.14 // indirect
+	github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0-dev.15 // indirect
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect

diff --git a/go.sum b/go.sum
@@ -43,18 +43,18 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/eclipse/paho.mqtt.golang v1.4.1 h1:tUSpviiL5G3P9SZZJPC4ZULZJsxQKXxfENpMvdbAXAI=
 github.com/eclipse/paho.mqtt.golang v1.4.1/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA=
-github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0-dev.24 h1:5ABpH5zaHkirFx3zlW4etLBLqeQwWRmBitlLpRKjbRE=
-github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0-dev.24/go.mod h1:4V9NUSeo0ulJPhWMuiN+hPbNiY3I83b+zWhR+hFjovE=
-github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0-dev.14 h1:hjAFgpx/e0iLjESYmKQ3oc4hALJ2BD6qpd9Qk8SIV1U=
-github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0-dev.14/go.mod h1:4do/6nXmtMcWoMu4eqKjlr3Ot+l0rF68qOJpZwnN9R8=
+github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0-dev.26 h1:2axOywBKt0YR49QJHn9NKJgiXovFFdw0tkZl3OmfO/U=
+github.com/edgexfoundry/go-mod-bootstrap/v2 v2.3.0-dev.26/go.mod h1:U9cwj8TC9RmQfdrlWmag+dcrcZnMmbda26aonocZeek=
+github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0-dev.15 h1:HN9u4TMQmMHubyRMsuejeHXrOjQB/5vD1ARFgy0BaIo=
+github.com/edgexfoundry/go-mod-configuration/v2 v2.3.0-dev.15/go.mod h1:1tKJhcPEWftFy+I4n7+sNIBOo7H5ys/QaPvyXl0tMtc=
 github.com/edgexfoundry/go-mod-core-contracts/v2 v2.3.0-dev.18 h1:Smkhoqq9+XsMcs0B3JokAmIT7hXJy9eQWk6SYk9z4yE=
 github.com/edgexfoundry/go-mod-core-contracts/v2 v2.3.0-dev.18/go.mod h1:4/e61acxVkhQWCTjQ4XcHVJDnrMDloFsZZB1B6STCRw=
 github.com/edgexfoundry/go-mod-messaging/v2 v2.3.0-dev.24 h1:h2hsipXIC72xySkgS/uwq3HOyFQ3iiJCRgXGodeXTUU=
 github.com/edgexfoundry/go-mod-messaging/v2 v2.3.0-dev.24/go.mod h1:S78Q/vqwRiu11oJFqB3NoyV1kQ7pGfuzVb41FDWjNsA=
 github.com/edgexfoundry/go-mod-registry/v2 v2.3.0-dev.11 h1:OWBQB6AGt7S32afhMS/0FA3NDoaInQQ6EPhrO9dPHF8=
 github.com/edgexfoundry/go-mod-registry/v2 v2.3.0-dev.11/go.mod h1:Gyx8a+7jfzy53ljq9kgiz553xhgYYKNNWhnaTn76i+g=
-github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0-dev.9 h1:K6wGLHXASBcCEJrIec4vvTNkuooduOS+9TtjhrBm3Jc=
-github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0-dev.9/go.mod h1:h/FohFNY8xHalioLg1bhjAuEj0z+danSDtixirvaXmQ=
+github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0-dev.10 h1:pNJLsU/ZWEpIc5FMyJcEgGISNQyCVhQUjSB9f7J0Se4=
+github.com/edgexfoundry/go-mod-secrets/v2 v2.3.0-dev.10/go.mod h1:9xMRSDWyJqoTu23yOpNCL7/vw5gOPDys+zN3gWj9fMs=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=