Merge pull request #1461 from cyberark/release-1.7.11

Bump version to 1.7.11

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.7.11] - 2022-04-29
+
 ### Added
 - Support for building on Apple M1 hardware.
   [cyberark/secretless-broker#1456](https://github.com/cyberark/secretless-broker/pull/1456)
@@ -638,7 +640,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - The first tagged version.
 
-[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.7.10...HEAD
+[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.7.11...HEAD
 [0.2.0]: https://github.com/cyberark/secretless-broker/compare/v0.1.0...v0.2.0
 [0.3.0]: https://github.com/cyberark/secretless-broker/compare/v0.2.0...v0.3.0
 [0.4.0]: https://github.com/cyberark/secretless-broker/compare/v0.3.0...v0.4.0
@@ -675,3 +677,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [1.7.8]: https://github.com/cyberark/secretless-broker/compare/v1.7.7...v1.7.8
 [1.7.9]: https://github.com/cyberark/secretless-broker/compare/v1.7.8...v1.7.9
 [1.7.10]: https://github.com/cyberark/secretless-broker/compare/v1.7.9...v1.7.10
+[1.7.11]: https://github.com/cyberark/secretless-broker/compare/v1.7.10...v1.7.11

Dockerfile

@@ -42,7 +42,7 @@ RUN go build -ldflags="-X github.com/cyberark/secretless-broker/pkg/secretless.T
 
 
 # =================== MAIN CONTAINER ===================
-FROM alpine:3.14 as secretless-broker
+FROM alpine:3.15 as secretless-broker
 MAINTAINER CyberArk Software Ltd.
 
 RUN apk add -u shadow libc6-compat openssl && \
@@ -94,6 +94,9 @@ LABEL summary="Secure your apps by making them Secretless"
 LABEL description="Secretless Broker is a connection broker which relieves client \
 applications of the need to directly handle secrets to target services"
 
+# Update packages to get CVE fixes
+RUN dnf update -y
+
     # Add Limited user
 RUN groupadd -r secretless \
              -g 777 && \

NOTICES.txt

@@ -11,7 +11,7 @@ SECTION 1: Apache License 2.0
 >>> github.com/aws/aws-sdk-go-1.15.79
 >>> github.com/cyberark/conjur-api-go-0.8.1
 >>> github.com/cyberark/conjur-authn-k8s-client-0.23.0
->>> github.com/docker/docker-1.4.2-0.20191231165639-e6f6c35b7902
+>>> github.com/docker/docker-20.10.14+incompatible
 >>> github.com/heptiolabs/healthcheck-0.0.0-20180807145615-6ff867650f40
 >>> gopkg.in/yaml.v2-2.4.0
 >>> k8s.io/api-0.23.1
@@ -113,7 +113,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 
->>> github.com/docker/docker-1.4.2-0.20191231165639-e6f6c35b7902
+>>> github.com/docker/docker-20.10.14+incompatible
 
 Copyright 2013-2018 Docker, Inc.
 

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/pkg/profile v1.2.1
 	github.com/smartystreets/goconvey v1.6.4
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
+	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.23.1
 	k8s.io/apiextensions-apiserver v0.22.3

go.sum

@@ -601,8 +601,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
+golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

pkg/secretless/version.go

@@ -4,7 +4,7 @@ import "fmt"
 
 // Version field is a SemVer that should indicate the baked-in version
 // of the broker
-var Version = "1.7.10"
+var Version = "1.7.11"
 
 // Tag field denotes the specific build type for the broker. It may
 // be replaced by compile-time variables if needed to provide the git