Merge pull request #68 from crazy-max/compose-update

examples: generate random password for db root

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

examples/mariadb/compose.yml

@@ -1,6 +1,6 @@
 services:
   db:
-    image: mariadb:10.4
+    image: mariadb:10
     container_name: pureftpd_db
     networks:
       - pureftpd
@@ -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"