From 81d57e85b3e0f2a181782734b29fd0a4d7c25c3b Mon Sep 17 00:00:00 2001 From: Parwinder Bhagat Date: Mon, 30 Sep 2024 21:56:45 -0500 Subject: [PATCH] update GO docker images --- Dockerfiles/Dockerfile.bcda_prod | 8 ++++---- Dockerfiles/Dockerfile.bcdaworker_prod | 6 +++--- Dockerfiles/Dockerfile.ssas | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfiles/Dockerfile.bcda_prod b/Dockerfiles/Dockerfile.bcda_prod index 0b0285dba..11d4e4119 100644 --- a/Dockerfiles/Dockerfile.bcda_prod +++ b/Dockerfiles/Dockerfile.bcda_prod @@ -11,17 +11,17 @@ WORKDIR /go/src/github.com/CMSgov/bcda-app COPY go.mod go.sum tools.go ./ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download -RUN --mount=type=cache,target=/go/pkg/mod \ - cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get % +RUN --mount=type=cache,target=/go/pkg/mod \ + cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get % COPY . . WORKDIR /go/src/github.com/CMSgov/bcda-app/bcda RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - go install -v + go install -v # syntax = docker/dockerfile:1-experimental -FROM golang:1.21-alpine3.20 +FROM golang:1.23.1-alpine3.20 ARG ENVIRONMENT # only add dev packages if the environment argument was set to development RUN [ "$ENVIRONMENT" != "development" ] || apk add git openssl entr bash diff --git a/Dockerfiles/Dockerfile.bcdaworker_prod b/Dockerfiles/Dockerfile.bcdaworker_prod index c43338f8e..c51b8609b 100644 --- a/Dockerfiles/Dockerfile.bcdaworker_prod +++ b/Dockerfiles/Dockerfile.bcdaworker_prod @@ -11,8 +11,8 @@ WORKDIR /go/src/github.com/CMSgov/bcda-app COPY go.mod go.sum tools.go ./ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download -RUN --mount=type=cache,target=/go/pkg/mod \ - cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get % +RUN --mount=type=cache,target=/go/pkg/mod \ + cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get % COPY . . WORKDIR /go/src/github.com/CMSgov/bcda-app/bcdaworker @@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ go install -v # syntax = docker/dockerfile:1-experimental -FROM golang:1.21-alpine3.20 +FROM golang:1.23.1-alpine3.20 ARG ENVIRONMENT # only add dev packages if the environment argument was set to development RUN [ "$ENVIRONMENT" != "development" ] || apk add git openssl entr bash diff --git a/Dockerfiles/Dockerfile.ssas b/Dockerfiles/Dockerfile.ssas index fd011048e..db2003934 100644 --- a/Dockerfiles/Dockerfile.ssas +++ b/Dockerfiles/Dockerfile.ssas @@ -10,8 +10,8 @@ WORKDIR /go/src/github.com/CMSgov/bcda-app # By pulling this step out, we can leverage Docker caching # since our tooling/dependencies do not frequently change. COPY go.mod go.sum tools.go ./ -RUN --mount=type=cache,target=/go/pkg/mod \ - cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get % +RUN --mount=type=cache,target=/go/pkg/mod \ + cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get % COPY . . WORKDIR /go @@ -26,7 +26,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ go install -v ./ssas/service/main -FROM golang:1.21-alpine3.20 AS prod +FROM golang:1.23.1-alpine3.20 AS prod RUN apk update upgrade RUN apk add openssl