Skip to content

Commit

Permalink
Replace .my.cnf with column-statistics.cnf at the system level for my…
Browse files Browse the repository at this point in the history
…sqldump

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.
  • Loading branch information
misilot committed Jan 29, 2022
1 parent a65fb63 commit fb58595
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####################

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.fpm-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
File renamed without changes.

0 comments on commit fb58595

Please sign in to comment.