DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace .my.cnf with column-statistics.cnf at the system level for mysqldump

Browse source 
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.
This commit is contained in:
Tom Misilo 2022-01-29 07:16:48 -06:00
parent a65fb63b6b
commit fb585955b4
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -77,7 +77,7 @@ COPY . /var/www/html
RUN a2enmod rewrite 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 ##################### ############ INITIAL APPLICATION SETUP #####################

2
Dockerfile.alpine
View file

@ -34,7 +34,7 @@ RUN apk add --no-cache \
mysql-client \ mysql-client \
tini 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 # Where apache's PID lives
RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2 RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2

2
Dockerfile.fpm-alpine
View file

@ -98,6 +98,6 @@ VOLUME [ "/var/lib/snipeit" ]
COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env 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 --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" ] ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ] CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]

0
docker/.my.cnf → docker/column-statistics.cnf
View file