DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #10580 from misilot/fix-10176-webui-master

Browse source 
Replace .my.cnf with column-statistics.cnf at the system level for mysqldump (master)
This commit is contained in:
snipe 2022-01-29 07:16:24 -08:00 committed by GitHub
parent 16fb2213b5 b0c61ee044
commit 215beb9d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
COPY docker/.my.cnf /root/.my.cnf
COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
############ INITIAL APPLICATION SETUP #####################

2
Dockerfile.alpine
View file

@ -32,7 +32,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

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 --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" ]

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