Skip to content

Commit

Permalink
bump go to 1.22.6
Browse files Browse the repository at this point in the history
Signed-off-by: Janne Kataja <[email protected]>
  • Loading branch information
sdx-jkataja committed Aug 22, 2024
1 parent 934b3ea commit 53a9b8f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 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-bookworm AS velero-builder
FROM --platform=$BUILDPLATFORM golang:1.22.6-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-bookworm AS restic-builder
FROM --platform=$BUILDPLATFORM golang:1.22.6-bookworm AS restic-builder

ARG BIN
ARG TARGETOS
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 as tilt-helper
FROM golang:1.22.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 && \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/vmware-tanzu/velero

go 1.22.0
go 1.22.6

require (
cloud.google.com/go/storage v1.40.0
Expand Down
4 changes: 2 additions & 2 deletions 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-bookworm
FROM --platform=$TARGETPLATFORM golang:1.22.6-bookworm

ARG GOPROXY

Expand Down Expand Up @@ -102,4 +102,4 @@ RUN chmod +x ./kubectl
RUN mv ./kubectl /usr/local/bin

# Fix the "dubious ownership" issue from git when running goreleaser.sh
RUN echo "[safe] \n\t directory = *" > /.gitconfig
RUN echo "[safe] \n\t directory = *" > /.gitconfig

0 comments on commit 53a9b8f

Please sign in to comment.