From 930666ffa0b18294caf92cfe10cf0fe3859de6c4 Mon Sep 17 00:00:00 2001 From: Thomas Misilo Date: Thu, 13 Jan 2022 14:36:00 -0600 Subject: [PATCH] Adding .my.cnf to disable column-statistics backup Fixes #10176 The ```.my.cnf``` file is copied to ```/root/.my.cnf``` for each Dockerfile that exists --- Dockerfile | 2 ++ Dockerfile.alpine | 2 ++ Dockerfile.fpm-alpine | 1 + docker/.my.cnf | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 docker/.my.cnf diff --git a/Dockerfile b/Dockerfile index ed942e2587..ba0c02b720 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,6 +77,8 @@ COPY . /var/www/html RUN a2enmod rewrite +COPY docker/.my.cnf /root/.my.cnf + ############ INITIAL APPLICATION SETUP ##################### WORKDIR /var/www/html diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 6adc780924..3d23693383 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -34,6 +34,8 @@ RUN apk add --no-cache \ mysql-client \ tini +COPY docker/.my.cnf /root/.my.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 3452a6f89b..ef4eb6fa2c 100644 --- a/Dockerfile.fpm-alpine +++ b/Dockerfile.fpm-alpine @@ -98,5 +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 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/.my.cnf new file mode 100644 index 0000000000..e3bb308082 --- /dev/null +++ b/docker/.my.cnf @@ -0,0 +1,2 @@ +[mysqldump] +column-statistics=0