Skip to content

Commit

Permalink
bump alpine and jwt-go (#4723) (#4725)
Browse files Browse the repository at this point in the history 
* bump alpine and jwt-go (#4723)

* bump alpine and jwt-go
* bump docs alpine
* fix changelog
  • Loading branch information
@npolshakova
npolshakova authored May 12, 2021
1 parent edb99af commit eecee15
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 12 deletions.
11 changes: 11 additions & 0 deletions changelog/v1.6.26/bump-jwt-go.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
changelog:
- type: DEPENDENCY_BUMP
dependencyOwner: dgrijalva
dependencyRepo: jwt-go
dependencyTag: v4.0.0-preview1
description: Fix for https://nvd.nist.gov/vuln/detail/CVE-2020-26160
- type: DEPENDENCY_BUMP
dependencyOwner: linux
dependencyRepo: alpine
dependencyTag: 3.13.5
description: Fix for apk-tools CVE-2021-30139 https://gitlab.alpinelinux.org/alpine/aports/-/issues/12606
2 changes: 1 addition & 1 deletion docs/content/guides/security/tls/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

COPY cert.pem /cert.pem
COPY key.pem /key.pem
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/session-affinity/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

RUN apk upgrade --update-cache \
&& apk add ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion example/proxycontroller/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

COPY proxycontroller-linux-amd64 /usr/local/bin/proxycontroller

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403
github.com/containerd/containerd v1.3.3 // indirect
github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
github.com/docker/cli v0.0.0-20200210162036-a4bedce16568 // indirect
github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e // indirect
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8l
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 h1:CaO/zOnF8VvUfEbhRatPcwKVWamvbYd8tQGRWacE9kU=
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1/go.mod h1:+hnT3ywWDTAFrW5aE+u2Sa/wT555ZqwoCS+pk3p6ry4=
github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E=
github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E=
github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77/go.mod h1:Va5MyIzkU0rAM92tn3hb3Anb7oz7KcnixF49+2wOMe4=
Expand Down
2 changes: 1 addition & 1 deletion jobs/certgen/cmd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion projects/accesslogger/cmd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion projects/discovery/cmd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion projects/examples/services/sleeper/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

RUN apk upgrade --update-cache \
&& apk add ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion projects/gateway/cmd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion projects/ingress/cmd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion projects/sds/cmd/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.2
FROM alpine:3.13.5

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/aws_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sts"
"github.com/dgrijalva/jwt-go"
"github.com/dgrijalva/jwt-go/v4"
gwdefaults "github.com/solo-io/gloo/projects/gateway/pkg/defaults"
aws2 "github.com/solo-io/gloo/projects/gloo/pkg/api/external/envoy/extensions/aws"
"github.com/solo-io/gloo/test/helpers"
Expand Down

0 comments on commit eecee15

Please sign in to comment.