Skip to content

Commit

Permalink
Merge pull request #8545 from Lyndon-Li/release-1.15
Browse files Browse the repository at this point in the history
Pin the version of Golang and base image for v1.15.1
  • Loading branch information
kaovilai authored Dec 23, 2024
2 parents 5ca1d18 + 6e9397d commit 845f4ee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Velero binary build section
FROM --platform=$BUILDPLATFORM golang:1.22.8-bookworm AS velero-builder
FROM --platform=$BUILDPLATFORM golang:1.22.10-bookworm AS velero-builder

ARG GOPROXY
ARG BIN
Expand Down Expand Up @@ -47,7 +47,7 @@ RUN mkdir -p /output/usr/bin && \
go clean -modcache -cache

# Restic binary build section
FROM --platform=$BUILDPLATFORM golang:1.22.8-bookworm AS restic-builder
FROM --platform=$BUILDPLATFORM golang:1.22.10-bookworm AS restic-builder

ARG BIN
ARG TARGETOS
Expand All @@ -70,7 +70,7 @@ RUN mkdir -p /output/usr/bin && \
go clean -modcache -cache

# Velero image packing section
FROM paketobuildpacks/run-jammy-tiny:0.2.52
FROM paketobuildpacks/run-jammy-tiny:0.2.56

LABEL maintainer="Xun Jiang <jxun@vmware.com>"

Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.22.8 as tilt-helper
FROM golang:1.22.10 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 && \
Expand Down
2 changes: 1 addition & 1 deletion hack/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$TARGETPLATFORM golang:1.22.8-bookworm
FROM --platform=$TARGETPLATFORM golang:1.22.10-bookworm

ARG GOPROXY

Expand Down

0 comments on commit 845f4ee

Please sign in to comment.