minor update to Dockerfiles and CI

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2025-04-14 13:40:55 +02:00
parent 302a7fafc3
commit 899c739b82
6 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -463,7 +463,7 @@ jobs:
build-linux-packages:
name: Build Linux packages
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
+3 -3
View File
@@ -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:
+1 -1
View File
@@ -296,7 +296,7 @@ jobs:
prepare-linux:
name: Prepare Linux binaries
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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