Skip to content

Commit

Permalink
Update Dockerfiles to Go 1.21 (#10175)
Browse files Browse the repository at this point in the history
  • Loading branch information
SarahFrench authored Mar 13, 2024
1 parent 6c7c0fb commit 7fa5974
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .ci/containers/build-environment/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1: Building Go dependencies
FROM golang:1.20-bullseye AS builder
FROM golang:1.21-bullseye AS builder

# Set working directory
WORKDIR /app
Expand All @@ -15,7 +15,7 @@ RUN go mod download
FROM ruby:3.1-bullseye

# golang
COPY --from=golang:1.20-bullseye /usr/local/go /usr/local/go
COPY --from=golang:1.21-bullseye /usr/local/go /usr/local/go
ENV GOPATH /go
ENV PATH /usr/local/go/bin:$PATH
ENV PATH $GOPATH/bin:$PATH
Expand Down
4 changes: 2 additions & 2 deletions .ci/containers/go-plus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1: Download go module cache for builds
FROM golang:1.20-bullseye AS builder
FROM golang:1.21-bullseye AS builder
ENV GOCACHE=/go/cache

RUN apt-get update && apt-get install -y unzip
Expand All @@ -12,7 +12,7 @@ WORKDIR /app1/magic-modules-main/.ci/magician
RUN go build -o /dev/null .

# Stage 2: Creating the final image
FROM golang:1.20-bullseye
FROM golang:1.21-bullseye
SHELL ["/bin/bash", "-c"]
ENV GOCACHE=/go/cache

Expand Down

0 comments on commit 7fa5974

Please sign in to comment.