Skip to content
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
39 changes: 18 additions & 21 deletions .circleci/.anchore/grype.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
ignore:
- vulnerability: CVE-2023-47038
- vulnerability: CVE-2023-5981

# https://github.com/anchore/grype#specifying-matches-to-ignore
# example to ignore a vulnerability
# This is the full set of supported rule fields:
Expand All @@ -10,25 +13,19 @@ ignore:
# type: npm
# location: "/usr/local/lib/node_modules/**"

- package:
type: go-module
- package:
type: go-module

# google-cloud-sdk python vulns
- vulnerability: GHSA-w7pp-m8wf-vj6r
package:
name: cryptography
version: 36.0.2
type: python
location: "/usr/lib/google-cloud-sdk/platform/bundledpythonunix/lib/**"
- vulnerability: GHSA-x4qr-2fvf-3mr5
package:
name: cryptography
version: 36.0.2
type: python
location: "/usr/lib/google-cloud-sdk/platform/bundledpythonunix/lib/**"
- vulnerability: GHSA-vvpx-j8f3-3w6h
package:
name: golang.org/x/net
version: v0.5.0
type: go-module
location: "/usr/lib/google-cloud-sdk/bin/**"
# google-cloud-sdk python vulns
- vulnerability: GHSA-jfhm-5ghh-2f97
package:
name: cryptography
version: 41.0.5
type: python
location: "/usr/lib/google-cloud-sdk/platform/bundledpythonunix/lib/**"
- vulnerability: GHSA-mq26-g339-26xf
package:
name: pip
version: 23.2.1
type: python
location: "/usr/lib/google-cloud-sdk/platform/bundledpythonunix/lib/**"
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
machine: true
environment:
GOPATH: /home/circleci/go
GO_SHA256SUM: 87fc728c9c731e2f74e4a999ef53cf07302d7ed3504b0839027bd9c10edaa3fd
GO_SHA256SUM: 9c5d48c54dd8b0a3b2ef91b0f92a1190aa01f11d26e98033efa64c46a30bba7b
GO: /usr/local/go/bin/go
GOCACHE: "/tmp/go/cache"
steps:
Expand All @@ -49,7 +49,7 @@ jobs:
keys:
- support-bundle-e2e-build-cache-base
- run: |
export GO_DOWNLOAD_URL=https://go.dev/dl/go1.17.10.linux-amd64.tar.gz
export GO_DOWNLOAD_URL=https://go.dev/dl/go1.20.12.linux-amd64.tar.gz
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

everything else in this repo uses 1.20 and 1.17 stopped working this time around

export GOPATH=/home/circleci/go
export GOROOT=/usr/local/go
export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
Expand Down
2 changes: 1 addition & 1 deletion deploy/Dockerfile-base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bookworm-slim
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -y && apt-get install --no-install-recommends -y \
ca-certificates \
Expand Down