diff --git a/.github/workflows/crds-verify-kind.yaml b/.github/workflows/crds-verify-kind.yaml index 8fbf267768..e6067b39c8 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@v4 with: - go-version: '1.21' + go-version: '1.21.6' 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 3640de5998..cc13ad170f 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@v4 with: - go-version: '1.21' + go-version: '1.21.6' 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@v4 with: - go-version: '1.21' + go-version: '1.21.6' 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 7f7b65cd48..42d423de61 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@v4 with: - go-version: '1.21' + go-version: '1.21.6' id: go - name: Check out the code uses: actions/checkout@v2 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 06e74f7d04..35b12730c6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.21' + go-version: '1.21.6' id: go - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 9faec3529c..f8b57389ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Velero binary build section -FROM --platform=$BUILDPLATFORM golang:1.21-bookworm as velero-builder +FROM --platform=$BUILDPLATFORM golang:1.21.6-bookworm as velero-builder ARG GOPROXY ARG BIN @@ -47,7 +47,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Restic binary build section -FROM --platform=$BUILDPLATFORM golang:1.21-bookworm as restic-builder +FROM --platform=$BUILDPLATFORM golang:1.21.6-bookworm as restic-builder ARG BIN ARG TARGETOS @@ -70,7 +70,7 @@ RUN mkdir -p /output/usr/bin && \ go clean -modcache -cache # Velero image packing section -FROM paketobuildpacks/run-jammy-tiny:latest +FROM paketobuildpacks/run-jammy-tiny:0.2.19 LABEL maintainer="Xun Jiang " diff --git a/Tiltfile b/Tiltfile index 8ab2209040..660ce6c3c2 100644 --- a/Tiltfile +++ b/Tiltfile @@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip( tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.21 as tilt-helper +FROM golang:1.21.6 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/go.mod b/go.mod index aeb1288992..2093cd6ea7 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/vmware-tanzu/velero go 1.21 -toolchain go1.21.3 +toolchain go1.21.6 require ( cloud.google.com/go/storage v1.33.0 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 5a7bbc6f52..5e3021d2b4 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.21-bookworm +FROM --platform=linux/amd64 golang:1.21.6-bookworm ARG GOPROXY