mirror of
https://github.com/invoiceninja/dockerfiles.git
synced 2025-12-31 19:47:25 +01:00
Merge pull request #789 from benbrummer/debian
Workaround: Disable SSL for mariadb-client for compatibility with MySQL
This commit is contained in:
3
debian/Dockerfile
vendored
3
debian/Dockerfile
vendored
@@ -68,6 +68,9 @@ COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini
|
|||||||
|
|
||||||
COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/invoiceninja.conf
|
COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/invoiceninja.conf
|
||||||
|
|
||||||
|
# Workaround: Disable SSL for mariadb-client for compatibility with MySQL
|
||||||
|
RUN echo "skip-ssl = true" >> /etc/mysql/mariadb.conf.d/50-client.cnf
|
||||||
|
|
||||||
# Setup supervisor
|
# Setup supervisor
|
||||||
COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
|
|
||||||
|
|||||||
4
debian/scripts/init.sh
vendored
4
debian/scripts/init.sh
vendored
@@ -38,10 +38,6 @@ if [ "$*" = 'supervisord -c /etc/supervisor/supervisord.conf' ]; then
|
|||||||
/var/www/html/storage \
|
/var/www/html/storage \
|
||||||
-type d -exec chmod 755 {} \;
|
-type d -exec chmod 755 {} \;
|
||||||
|
|
||||||
# Fix mariadb-client connection to mysql
|
|
||||||
echo "[client]\nskip-ssl = true" > /var/www/.my.cnf
|
|
||||||
chown www-data:www-data /var/www/.my.cnf
|
|
||||||
|
|
||||||
# Clear and cache config in production
|
# Clear and cache config in production
|
||||||
if [ "$APP_ENV" = "production" ]; then
|
if [ "$APP_ENV" = "production" ]; then
|
||||||
runuser -u www-data -- php artisan optimize
|
runuser -u www-data -- php artisan optimize
|
||||||
|
|||||||
Reference in New Issue
Block a user