From c4bc88cd2e8d95207a0e9351ff03320a163cd7e4 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Fri, 10 Oct 2025 20:23:40 +0200 Subject: [PATCH] Docker: update to debian 13 also update nfpm to 2.43.4 Signed-off-by: Nicola Murino --- Dockerfile | 4 ++-- Dockerfile.distroless | 4 ++-- pkgs/build.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c38f38e5..0fda7346 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25-bookworm AS builder +FROM golang:1.25-trixie AS builder ENV GOFLAGS="-mod=readonly" @@ -30,7 +30,7 @@ ARG DOWNLOAD_PLUGINS=false RUN if [ "${DOWNLOAD_PLUGINS}" = "true" ]; then apt-get update && apt-get install --no-install-recommends -y curl && ./docker/scripts/download-plugins.sh; fi -FROM debian:bookworm-slim +FROM debian:trixie-slim # Set to "true" to install jq and the optional git and rsync dependencies ARG INSTALL_OPTIONAL_PACKAGES=false diff --git a/Dockerfile.distroless b/Dockerfile.distroless index f2a828bd..053315cc 100644 --- a/Dockerfile.distroless +++ b/Dockerfile.distroless @@ -1,4 +1,4 @@ -FROM golang:1.25-bookworm AS builder +FROM golang:1.25-trixie AS builder ENV CGO_ENABLED=0 GOFLAGS="-mod=readonly" @@ -32,7 +32,7 @@ RUN sed -i 's|"users_base_dir": "",|"users_base_dir": "/srv/sftpgo/data",|' sftp RUN mkdir /etc/sftpgo /var/lib/sftpgo /srv/sftpgo -FROM gcr.io/distroless/static-debian12 +FROM gcr.io/distroless/static-debian13 COPY --from=builder --chown=1000:1000 /etc/sftpgo /etc/sftpgo COPY --from=builder --chown=1000:1000 /srv/sftpgo /srv/sftpgo diff --git a/pkgs/build.sh b/pkgs/build.sh index 981cfa7c..68d6798b 100755 --- a/pkgs/build.sh +++ b/pkgs/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -NFPM_VERSION=2.43.3 +NFPM_VERSION=2.43.4 NFPM_ARCH=${NFPM_ARCH:-amd64} if [ -z ${SFTPGO_VERSION} ] then