Skip to content

Commit

Permalink
chore: update docker base images (ory#3521)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-jonas authored Sep 19, 2023
1 parent fc057a8 commit 30ba71e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .docker/Dockerfile-build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# syntax = docker/dockerfile:1-experimental
# Workaround for https://github.com/GoogleContainerTools/distroless/issues/1342
FROM golang:1.19-bullseye AS builder
FROM golang:1.21 AS builder

RUN apt-get update && apt-get upgrade -y &&\
mkdir -p /var/lib/sqlite
mkdir -p /var/lib/sqlite

WORKDIR /go/src/github.com/ory/kratos

Expand All @@ -25,11 +25,11 @@ ARG COMMIT
ARG BUILD_DATE

RUN --mount=type=cache,target=/root/.cache/go-build go build -tags sqlite \
-ldflags="-X 'github.com/ory/kratos/driver/config.Version=${VERSION}' -X 'github.com/ory/kratos/driver/config.Date=${BUILD_DATE}' -X 'github.com/ory/kratos/driver/config.Commit=${COMMIT}'" \
-o /usr/bin/kratos
-ldflags="-X 'github.com/ory/kratos/driver/config.Version=${VERSION}' -X 'github.com/ory/kratos/driver/config.Date=${BUILD_DATE}' -X 'github.com/ory/kratos/driver/config.Commit=${COMMIT}'" \
-o /usr/bin/kratos

#########################
FROM gcr.io/distroless/base-nossl-debian11:nonroot AS runner
FROM gcr.io/distroless/base-nossl-debian12:nonroot AS runner

COPY --from=builder --chown=nonroot:nonroot /var/lib/sqlite /var/lib/sqlite
COPY --from=builder --chown=nonroot:nonroot /usr/bin/kratos /usr/bin/kratos
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile-debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-buster
FROM golang:1.21
ENV CGO_ENABLED 1

RUN apt-get update && apt-get install -y --no-install-recommends inotify-tools psmisc
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile-distroless-static
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/static-debian11:nonroot
FROM gcr.io/distroless/static-debian12:nonroot

COPY kratos /usr/bin/kratos
EXPOSE 4433 4434
Expand Down

0 comments on commit 30ba71e

Please sign in to comment.