Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.14] Fix 12/8/2023 CVEs #8977

Merged
merged 3 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ ifeq ($(GOOS),)
endif

GO_BUILD_FLAGS := GO111MODULE=on CGO_ENABLED=0 GOARCH=$(GOARCH)
GOLANG_VERSION := golang:1.20.1-alpine
GOLANG_VERSION := golang:1.20.12-alpine3.18

# Passed by cloudbuild
GCLOUD_PROJECT_ID := $(GCLOUD_PROJECT_ID)
Expand Down
9 changes: 9 additions & 0 deletions changelog/v1.14.28/fix-dec-8-2023-cves.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
changelog:
- type: DEPENDENCY_BUMP
dependencyOwner: linux
dependencyRepo: alpine
dependencyTag: 3.17.6
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: cloud-builders
dependencyTag: 0.7.1
8 changes: 4 additions & 4 deletions ci/cloudbuild/publish-artifacts.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:

- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.6.8'
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.1'
id: 'prepare-workspace'
args:
- '--repo-name'
Expand Down Expand Up @@ -44,7 +44,7 @@ steps:
- 'us-central1-a'

# Run make targets to push docker images to quay.io
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.6.8'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
id: 'docker-push-extended'
args:
- 'docker-push-extended'
Expand All @@ -65,7 +65,7 @@ steps:
waitFor:
- 'docker-push-extended'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.6.8'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
id: 'release-chart'
dir: *dir
args:
Expand All @@ -82,7 +82,7 @@ steps:
- 'gcr-auth'

# Run make targets to retag and push docker images to GCR
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.6.8'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
id: 'docker-push-extended-gcr'
dir: *dir
args:
Expand Down
10 changes: 5 additions & 5 deletions ci/cloudbuild/run-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:

- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.6.8'
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.1'
id: 'prepare-workspace'
args:
- '--repo-name'
Expand All @@ -23,7 +23,7 @@ steps:
cd /go/pkg
gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them"

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.6.8'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
id: 'prepare-envoy'
dir: *dir
entrypoint: 'bash'
Expand Down Expand Up @@ -68,7 +68,7 @@ steps:
waitFor:
- 'prepare-gcr-zone'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.6.8'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
id: 'prepare-test-tools'
dir: *dir
args:
Expand All @@ -79,7 +79,7 @@ steps:
- 'prepare-gcr-zone'
- 'prepare-test-credentials'

- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.6.8'
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.1'
id: 'run-tests'
dir: *dir
entrypoint: 'make'
Expand All @@ -90,7 +90,7 @@ steps:
secretEnv:
- 'JWT_PRIVATE_KEY'

- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.6.8'
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.1'
id: 'run-e2e-tests'
dir: *dir
entrypoint: 'make'
Expand Down
6 changes: 3 additions & 3 deletions cloudbuild-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ steps:
path: '/go/pkg'
id: 'untar-mod-cache'

- name: 'golang:1.20.1'
- name: 'golang:1.20.12'
args: ['go', 'mod', 'download']
volumes: *vol
id: 'download'

- name: 'golang:1.20.1'
- name: 'golang:1.20.12'
args: ['go', 'mod', 'tidy']
volumes: *vol
id: 'tidy'

- name: 'golang:1.20.1'
- name: 'golang:1.20.12'
entrypoint: 'bash'
volumes: *vol
args: ['-c', ' cd /go/pkg && tar -zvcf gloo-mod.tar.gz mod']
Expand Down
2 changes: 1 addition & 1 deletion docs/content/guides/dev/writing_auth_plugins/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ RUN chmod +x $VERIFY_SCRIPT
RUN $VERIFY_SCRIPT -pluginDir plugins -manifest plugins/plugin_manifest.yaml

# This stage builds the final image containing just the plugin .so files. It can really be any linux/amd64 image.
FROM alpine:3.17.3
FROM alpine:3.17.6

# Copy compiled plugin file from previous stage
RUN mkdir /compiled-auth-plugins
Expand Down
2 changes: 1 addition & 1 deletion docs/content/guides/security/tls/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.17.6

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

RUN apk upgrade --update-cache \
&& apk add ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/xslt-guide/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.17.6

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

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

Expand Down
2 changes: 1 addition & 1 deletion jobs/certgen/cmd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.17.6

ARG GOARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion jobs/kubectl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bitnami/kubectl:1.25.15 as kubectl

FROM alpine:3.17.3
FROM alpine:3.17.6

RUN apk upgrade --update-cache

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

ARG GOARCH=amd64
RUN apk -U upgrade && apk add ca-certificates && rm -rf /var/cache/apk/*
Expand Down
2 changes: 1 addition & 1 deletion projects/discovery/cmd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.17.6

ARG GOARCH=amd64

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

RUN apk upgrade --update-cache \
&& apk add ca-certificates \
Expand Down
2 changes: 1 addition & 1 deletion projects/gloo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ RUN CGO_ENABLED=1 GOARCH=${GOARCH} GOOS=linux go build \
projects/gloo/cmd/main.go


FROM alpine:3.17.3
FROM alpine:3.17.6
ARG GOARCH
COPY --from=build-env /go/src/github.com/solo-io/gloo/gloo-linux-${GOARCH} /
2 changes: 1 addition & 1 deletion projects/ingress/cmd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.17.6

ARG GOARCH=amd64

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

ARG GOARCH=amd64

Expand Down