Skip to content

Commit f7c148f

Browse files
fix(build): pin all usage of cloud-sdk image (#2484)
A recent apparent GCS performance regression in the Cloud SDK highlighted uncontrolled upgrading of the Cloud SDK Docker image. Pin everything to what #2480 pinned to for stability.
1 parent 325bd9e commit f7c148f

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

docker/terraform/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG TERRAFORM_VERSION
66
WORKDIR /build/
77
RUN GOBIN=$(pwd) go install github.com/hashicorp/terraform@v${TERRAFORM_VERSION}
88

9-
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
9+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
1010

1111
COPY --from=GO_BUILD /build/terraform /usr/bin/terraform
1212
COPY entrypoint.bash /builder/entrypoint.bash

vulnfeeds/cmd/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ COPY ./ /src/
2525
RUN go build -o alpine-osv ./cmd/alpine/
2626

2727

28-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
28+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
2929

3030
WORKDIR /root/
3131
COPY --from=GO_BUILD /src/alpine-osv ./

vulnfeeds/cmd/cpe-repo-gen/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN go mod download
2424
COPY ./ /src/
2525
RUN CGO_ENABLED=0 go build -o cpe-repo-gen ./cmd/cpe-repo-gen
2626

27-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
27+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
2828

2929
COPY --from=GO_BUILD /src/cpe-repo-gen ./
3030
COPY ./cmd/cpe-repo-gen/cpe-repo-gen_map.sh ./

vulnfeeds/cmd/debian-copyright-mirror/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
15+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
1616

1717
RUN apk add wget
1818

vulnfeeds/cmd/debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ COPY ./ /src/
2525
RUN go build -o debian-osv ./cmd/debian/
2626

2727

28-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
28+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
2929

3030
WORKDIR /root/
3131
COPY --from=GO_BUILD /src/debian-osv ./

vulnfeeds/cmd/download-cves/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN go mod download
2424
COPY ./ /src/
2525
RUN go build -o download-cves ./cmd/download-cves/
2626

27-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
27+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
2828
RUN apk --no-cache add jq
2929

3030
WORKDIR /usr/local/bin

vulnfeeds/cmd/nvd-cve-osv/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN go mod download && go mod verify
2222
COPY . .
2323
RUN CGO_ENABLED=0 go build -v -o /usr/local/bin ./cmd/nvd-cve-osv ./cmd/download-cves
2424

25-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine AS runtime
25+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4 AS runtime
2626
RUN apk --no-cache add jq
2727

2828
COPY --from=GO_BUILD /usr/local/bin/ ./usr/local/bin/

vulnfeeds/tools/debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM google/cloud-sdk:449.0.0-alpine
15+
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine@sha256:d5da0344b23d03a6f2728657732c7a60300a91acaad9b8076c6fd30b1dfe1ff4
1616

1717
# Keep the virtualenv directly in the project directory. This isn't strictly neccesary for
1818
# this project as it runs on kubernetes, but it keeps it consistent with other cloud run images

0 commit comments

Comments
 (0)