From 72680745ba2884dd87a1696a80eef5e8c6bad675 Mon Sep 17 00:00:00 2001 From: paspo Date: Mon, 29 Sep 2025 21:24:46 +0200 Subject: [PATCH] reorg --- Dockerfile | 9 ++------- automysqlbackup => rootfs/etc/default/automysqlbackup | 0 .../etc/mysql/conf.d/maria-include.cnf | 0 custom.cnf => rootfs/etc/mysql/mariadb.conf.d/custom.cnf | 0 mysql.cnf => rootfs/etc/mysql/mariadb.conf.d/mysql.cnf | 0 sudoers => rootfs/etc/sudoers.d/mysudoers | 0 .../usr/local/bin/docker-entrypoint-new.sh | 0 healthcheck.sh => rootfs/usr/local/bin/healthcheck.sh | 0 8 files changed, 2 insertions(+), 7 deletions(-) rename automysqlbackup => rootfs/etc/default/automysqlbackup (100%) rename maria-include.cnf => rootfs/etc/mysql/conf.d/maria-include.cnf (100%) rename custom.cnf => rootfs/etc/mysql/mariadb.conf.d/custom.cnf (100%) rename mysql.cnf => rootfs/etc/mysql/mariadb.conf.d/mysql.cnf (100%) rename sudoers => rootfs/etc/sudoers.d/mysudoers (100%) rename docker-entrypoint-new.sh => rootfs/usr/local/bin/docker-entrypoint-new.sh (100%) rename healthcheck.sh => rootfs/usr/local/bin/healthcheck.sh (100%) diff --git a/Dockerfile b/Dockerfile index 8247147..de8662d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,9 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -q -y cron sudo automysqlbackup -COPY mysql.cnf /etc/mysql/mariadb.conf.d/settings.cnf -COPY maria-include.cnf /etc/mysql/conf.d/maria-include.cnf -COPY custom.cnf /etc/mysql/mariadb.conf.d/custom.cnf +COPY rootfs / + RUN chown mysql:mysql /etc/mysql/mariadb.conf.d/custom.cnf -COPY docker-entrypoint-new.sh /usr/local/bin/ -COPY healthcheck.sh /usr/local/bin/ -COPY automysqlbackup /etc/default -COPY sudoers /etc/sudoers.d/mysudoers HEALTHCHECK --interval=30s --start-period=30s --timeout=3s \ CMD /usr/local/bin/healthcheck.sh diff --git a/automysqlbackup b/rootfs/etc/default/automysqlbackup similarity index 100% rename from automysqlbackup rename to rootfs/etc/default/automysqlbackup diff --git a/maria-include.cnf b/rootfs/etc/mysql/conf.d/maria-include.cnf similarity index 100% rename from maria-include.cnf rename to rootfs/etc/mysql/conf.d/maria-include.cnf diff --git a/custom.cnf b/rootfs/etc/mysql/mariadb.conf.d/custom.cnf similarity index 100% rename from custom.cnf rename to rootfs/etc/mysql/mariadb.conf.d/custom.cnf diff --git a/mysql.cnf b/rootfs/etc/mysql/mariadb.conf.d/mysql.cnf similarity index 100% rename from mysql.cnf rename to rootfs/etc/mysql/mariadb.conf.d/mysql.cnf diff --git a/sudoers b/rootfs/etc/sudoers.d/mysudoers similarity index 100% rename from sudoers rename to rootfs/etc/sudoers.d/mysudoers diff --git a/docker-entrypoint-new.sh b/rootfs/usr/local/bin/docker-entrypoint-new.sh similarity index 100% rename from docker-entrypoint-new.sh rename to rootfs/usr/local/bin/docker-entrypoint-new.sh diff --git a/healthcheck.sh b/rootfs/usr/local/bin/healthcheck.sh similarity index 100% rename from healthcheck.sh rename to rootfs/usr/local/bin/healthcheck.sh