From 74961e35b563e6a1a52d441132bbefd074ed4fb4 Mon Sep 17 00:00:00 2001 From: Peter Banik Date: Fri, 15 Sep 2023 12:05:58 +0200 Subject: [PATCH] Updated Docker base images --- client/Dockerfile | 8 ++++---- client/Dockerfile.release | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/Dockerfile b/client/Dockerfile index 34fb8b08fc..1a11eface5 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -10,16 +10,16 @@ # # frontend build -FROM node:19-buster-slim AS nodebuilder +FROM node:20-bookworm-slim AS nodebuilder +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git WORKDIR /root/dex COPY . . -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git WORKDIR /root/dex/client/webserver/site/ RUN npm clean-install RUN npm run build # dexc binary build -FROM golang:1.19-alpine AS gobuilder +FROM golang:1.21-alpine AS gobuilder COPY --from=nodebuilder /root/dex/ /root/dex/ WORKDIR /root/dex/client/cmd/dexc/ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build @@ -27,7 +27,7 @@ WORKDIR /root/dex/client/cmd/dexcctl/ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build # Final image -FROM debian:buster-slim +FROM debian:bookworm-slim RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates WORKDIR /dex ENV HOME /dex diff --git a/client/Dockerfile.release b/client/Dockerfile.release index 17aac5ecbf..a093b16791 100644 --- a/client/Dockerfile.release +++ b/client/Dockerfile.release @@ -13,7 +13,7 @@ # # dexc binary build -FROM golang:1.20-alpine AS gobuilder +FROM golang:1.21-alpine AS gobuilder WORKDIR /root/dex COPY . . WORKDIR /root/dex/client/cmd/dexc/ @@ -22,7 +22,7 @@ WORKDIR /root/dex/client/cmd/dexcctl/ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build # Final image -FROM debian:buster-slim +FROM debian:bookworm-slim RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ca-certificates WORKDIR /dex ENV HOME /dex