From de2f7a3f6b5a29b57ba58cce1ef7611fa5604123 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 27 May 2024 09:23:45 +0200
Subject: [PATCH 1/3] examples: generate random password for db root

---
 examples/mariadb/compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mariadb/compose.yml b/examples/mariadb/compose.yml
index af94adc..a25d6bb 100644
--- a/examples/mariadb/compose.yml
+++ b/examples/mariadb/compose.yml
@@ -9,7 +9,7 @@ services:
       - "./users.sql:/docker-entrypoint-initdb.d/users.sql"
     environment:
       - "TZ=Europe/Paris"
-      - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+      - "MARIADB_RANDOM_ROOT_PASSWORD=yes"
       - "MYSQL_DATABASE=pureftpd"
       - "MYSQL_USER=pureftpd"
       - "MYSQL_PASSWORD=asupersecretpassword"

From c1b322540972270950b304541ec90b4101c6be3d Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 27 May 2024 09:24:04 +0200
Subject: [PATCH 2/3] examples: bump mariadb version

---
 examples/mariadb/compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/mariadb/compose.yml b/examples/mariadb/compose.yml
index a25d6bb..931a666 100644
--- a/examples/mariadb/compose.yml
+++ b/examples/mariadb/compose.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: mariadb:10.4
+    image: mariadb:10
     container_name: pureftpd_db
     networks:
       - pureftpd

From a9743990f0373db918b7c6ec92ec1e372e961ad1 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 27 May 2024 09:25:38 +0200
Subject: [PATCH 3/3] dockerfile: fix src stage pos

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4df8cda..44ea0a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ ARG PUREFTPD_VERSION=1.0.50
 ARG ALPINE_VERSION=3.17
 ARG XX_VERSION=1.2.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
@@ -14,7 +16,6 @@ RUN git fetch origin "${PUREFTPD_VERSION}" && git checkout -q FETCH_HEAD
 COPY patchs /src
 RUN patch -p1 < ../minimal.patch
 
-FROM --platform=${BUILDPLATFORM} tonistiigi/xx:${XX_VERSION} AS xx
 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