From 9de61aa5a031803ebd2d3e50ad85a76934b46671 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Fri, 7 Apr 2023 17:59:11 +0800 Subject: [PATCH] Pin Golang and distroless version for v1.11. Signed-off-by: Xun Jiang --- .github/workflows/crds-verify-kind.yaml | 2 +- .github/workflows/e2e-test-kind.yaml | 4 ++-- .github/workflows/pr-ci-check.yml | 2 +- .github/workflows/push.yml | 2 +- Dockerfile | 6 +++--- Tiltfile | 2 +- hack/build-image/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/crds-verify-kind.yaml b/.github/workflows/crds-verify-kind.yaml index aea410cc6..836e6dea3 100644 --- a/.github/workflows/crds-verify-kind.yaml +++ b/.github/workflows/crds-verify-kind.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.19.8 id: go # Look for a CLI that's made for this PR - name: Fetch built CLI diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml index e069baa67..ef3548f25 100644 --- a/.github/workflows/e2e-test-kind.yaml +++ b/.github/workflows/e2e-test-kind.yaml @@ -14,7 +14,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.19.8 id: go # Look for a CLI that's made for this PR - name: Fetch built CLI @@ -72,7 +72,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.19.8 id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/pr-ci-check.yml b/.github/workflows/pr-ci-check.yml index 7d7fddfac..d70d96e93 100644 --- a/.github/workflows/pr-ci-check.yml +++ b/.github/workflows/pr-ci-check.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.19.8 id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 59e4c52ff..f17e6873b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.19.8 id: go - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 013d6f32a..3ea048776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.19-bullseye as velero-builder +FROM --platform=$BUILDPLATFORM golang:1.19.8-bullseye as velero-builder ARG GOPROXY ARG BIN @@ -44,7 +44,7 @@ RUN mkdir -p /output/usr/bin && \ -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN} # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.19-bullseye as restic-builder +FROM --platform=$BUILDPLATFORM golang:1.19.8-bullseye as restic-builder ARG BIN ARG TARGETOS @@ -66,7 +66,7 @@ RUN mkdir -p /output/usr/bin && \ /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh # Velero image packing section -FROM gcr.io/distroless/base-nossl-debian11:nonroot +FROM gcr.io/distroless/base-nossl-debian11@sha256:9523ef8cf054e23a81e722d231c6f604ab43a03c5b174b5c8386c78c0b6473d0 LABEL maintainer="Nolan Brubaker " diff --git a/Tiltfile b/Tiltfile index 70657cd09..866410de9 100644 --- a/Tiltfile +++ b/Tiltfile @@ -50,7 +50,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip( tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.19 as tilt-helper +FROM golang:1.19.8 as tilt-helper # Support live reloading with Tilt RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \ diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index dc6f26a6c..3dcb51b40 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=linux/amd64 golang:1.19-bullseye +FROM --platform=linux/amd64 golang:1.19.8-bullseye ARG GOPROXY