From fb585955b4939ac6909d2b2616500cffeb7f5a1b Mon Sep 17 00:00:00 2001 From: Tom Misilo Date: Sat, 29 Jan 2022 07:16:48 -0600 Subject: [PATCH] Replace .my.cnf with column-statistics.cnf at the system level for mysqldump Fixes #10176 The `column-statistics.cnf` file is copied to `/etc/mysql/conf.d/column-statistics.cnf` for each Dockerfile that exists. This puts it as a system level mysql client change, so the web ui interface also works. --- Dockerfile | 2 +- Dockerfile.alpine | 2 +- Dockerfile.fpm-alpine | 2 +- docker/{.my.cnf => column-statistics.cnf} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename docker/{.my.cnf => column-statistics.cnf} (100%) diff --git a/Dockerfile b/Dockerfile index ba0c02b720..f1f264d777 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ COPY . /var/www/html RUN a2enmod rewrite -COPY docker/.my.cnf /root/.my.cnf +COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf ############ INITIAL APPLICATION SETUP ##################### diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 3d23693383..702b2f5550 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -34,7 +34,7 @@ RUN apk add --no-cache \ mysql-client \ tini -COPY docker/.my.cnf /root/.my.cnf +COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf # Where apache's PID lives RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2 diff --git a/Dockerfile.fpm-alpine b/Dockerfile.fpm-alpine index ef4eb6fa2c..868e4dbae1 100644 --- a/Dockerfile.fpm-alpine +++ b/Dockerfile.fpm-alpine @@ -98,6 +98,6 @@ VOLUME [ "/var/lib/snipeit" ] COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint -COPY docker/.my.cnf /root/.my.cnf +COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ] CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ] \ No newline at end of file diff --git a/docker/.my.cnf b/docker/column-statistics.cnf similarity index 100% rename from docker/.my.cnf rename to docker/column-statistics.cnf