From ce8e758c76e8afc39b244b30ef11bd63fefe6f33 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Thu, 26 Dec 2024 10:48:58 +0100
Subject: [PATCH] Alpine Linux 3.21

---
 Dockerfile        | 11 +++++------
 Dockerfile-1.0.47 |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 44ea0a1..2c9e414 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,27 @@
 # syntax=docker/dockerfile:1
 
 ARG PUREFTPD_VERSION=1.0.50
-ARG ALPINE_VERSION=3.17
-ARG XX_VERSION=1.2.1
+ARG ALPINE_VERSION=3.21
+ARG XX_VERSION=1.6.1
 
 FROM --platform=${BUILDPLATFORM} tonistiigi/xx:${XX_VERSION} AS xx
 
 FROM --platform=${BUILDPLATFORM} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS src
-COPY --from=xx / /
 RUN apk --update --no-cache add git patch
 WORKDIR /src/pure-ftpd
-RUN git init . && git remote add origin "https://github.com/jedisct1/pure-ftpd.git"
 ARG PUREFTPD_VERSION
-RUN git fetch origin "${PUREFTPD_VERSION}" && git checkout -q FETCH_HEAD
+ADD "https://github.com/jedisct1/pure-ftpd.git#${PUREFTPD_VERSION}" .
 COPY patchs /src
 RUN patch -p1 < ../minimal.patch
 
 FROM --platform=${BUILDPLATFORM} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS builder
 COPY --from=xx / /
-RUN apk --update --no-cache add autoconf automake binutils clang14 file make pkgconf tar xz
+RUN apk --update --no-cache add autoconf automake binutils clang file make pkgconf tar xz
 ENV XX_CC_PREFER_LINKER=ld
 ARG TARGETPLATFORM
 RUN xx-apk --no-cache --update add \
     gcc \
+    libldap \
     linux-headers \
     musl-dev \
     libsodium-dev \
diff --git a/Dockerfile-1.0.47 b/Dockerfile-1.0.47
index 3d28f0f..df485c9 100644
--- a/Dockerfile-1.0.47
+++ b/Dockerfile-1.0.47
@@ -1,14 +1,13 @@
 # syntax=docker/dockerfile:1
 
 ARG PUREFTPD_VERSION=1.0.47
-ARG ALPINE_VERSION=3.17
+ARG ALPINE_VERSION=3.21
 
-FROM --platform=${BUILDPLATFORM:-linux/amd64} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS download
+FROM --platform=${BUILDPLATFORM:-linux/amd64} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS src
 RUN apk --update --no-cache add curl patch tar
-
-ARG PUREFTPD_VERSION
 WORKDIR /dist/pureftpd
 COPY patchs /dist
+ARG PUREFTPD_VERSION
 RUN curl -sSL "https://download.pureftpd.org/pub/pure-ftpd/releases/obsolete/pure-ftpd-${PUREFTPD_VERSION}.tar.gz" | tar xz --strip 1 \
   && patch -p1 < ../minimal.patch
 
@@ -26,7 +25,7 @@ RUN apk --update --no-cache add \
     openssl-dev \
   && rm -rf /tmp/*
 
-COPY --from=download /dist/pureftpd /tmp/pureftpd
+COPY --from=src /dist/pureftpd /tmp/pureftpd
 WORKDIR /tmp/pureftpd
 RUN ./configure \
     --prefix=/pure-ftpd \