Skip to content

Commit

Permalink
Merge pull request #17 from nytimes/go122
Browse files Browse the repository at this point in the history
Update Go to 1.22, gcloud to 463
  • Loading branch information
brianfoshee authored Feb 7, 2024
2 parents fbd6744 + dbb6eb0 commit f9d1509
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.21.0 as golang
FROM golang:1.22.0 as golang

FROM gcr.io/google.com/cloudsdktool/cloud-sdk:443.0.0-slim
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:463.0.0

COPY --from=golang /usr/local/go/ /usr/local/go/

Expand All @@ -10,7 +10,10 @@ ENV PATH=$PATH:/usr/local/go/bin
RUN go version

# ADD make and java
RUN apt-get install -y make default-jre
RUN apt-get update && apt-get install -y make default-jre

# ADD App Engine, Datastore emulator, and Firestore emulator
# ADD App Engine, Datastore emulator, and Firestore emulator.
# Leaving this here in case we figure out a way to install them in the :slim
# version of the cloud-sdk docker image, but they're all included by default
# in the full version of the image so this isn't technically necessary.
RUN apt-get install -y google-cloud-cli-app-engine-go google-cloud-cli-datastore-emulator google-cloud-cli-firestore-emulator

0 comments on commit f9d1509

Please sign in to comment.