From 899c739b827cbc54087a2d65293bc0bd54b4e653 Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Sun, 13 Apr 2025 08:25:13 +0200
Subject: [PATCH] minor update to Dockerfiles and CI

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
---
 .github/workflows/development.yml | 2 +-
 .github/workflows/docker.yml      | 6 +++---
 .github/workflows/release.yml     | 2 +-
 Dockerfile                        | 4 ++--
 Dockerfile.alpine                 | 4 ++--
 Dockerfile.distroless             | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
index 17be5a88..8a61daae 100644
--- a/.github/workflows/development.yml
+++ b/.github/workflows/development.yml
@@ -463,7 +463,7 @@ jobs:
 
   build-linux-packages:
     name: Build Linux packages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cce4ac74..85f68178 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-latest
         docker_pkg:
           - debian
           - alpine
@@ -25,10 +25,10 @@ jobs:
           - true
           - false
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-latest
             docker_pkg: distroless
             optional_deps: false
-          - os: ubuntu-22.04
+          - os: ubuntu-latest
             docker_pkg: debian-plugins
             optional_deps: true
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c8e60469..377a58cb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -296,7 +296,7 @@ jobs:
 
   prepare-linux:
     name: Prepare Linux binaries
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
diff --git a/Dockerfile b/Dockerfile
index 8b084a02..7d25e53c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24-bookworm as builder
+FROM golang:1.24-bookworm AS builder
 
 ENV GOFLAGS="-mod=readonly"
 
@@ -10,7 +10,7 @@ WORKDIR /workspace
 ARG GOPROXY
 
 COPY go.mod go.sum ./
-RUN go mod download
+RUN go mod download && go mod verify
 
 ARG COMMIT_SHA
 
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 707103e0..9027ef39 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine3.20 AS builder
+FROM golang:1.24-alpine3.21 AS builder
 
 ENV GOFLAGS="-mod=readonly"
 
@@ -25,7 +25,7 @@ RUN set -xe && \
     export COMMIT_SHA=${COMMIT_SHA:-$(git describe --always --abbrev=8 --dirty)} && \
     go build $(if [ -n "${FEATURES}" ]; then echo "-tags ${FEATURES}"; fi) -trimpath -ldflags "-s -w -X github.com/drakkan/sftpgo/v2/internal/version.commit=${COMMIT_SHA} -X github.com/drakkan/sftpgo/v2/internal/version.date=`date -u +%FT%TZ`" -v -o sftpgo
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # 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 3ba393ba..fbb147c3 100644
--- a/Dockerfile.distroless
+++ b/Dockerfile.distroless
@@ -1,4 +1,4 @@
-FROM golang:1.24-bookworm as builder
+FROM golang:1.24-bookworm AS builder
 
 ENV CGO_ENABLED=0 GOFLAGS="-mod=readonly"
 
@@ -10,7 +10,7 @@ WORKDIR /workspace
 ARG GOPROXY
 
 COPY go.mod go.sum ./
-RUN go mod download
+RUN go mod download && go mod verify
 
 ARG COMMIT_SHA