diff --git a/.env.sample b/.env.sample index c397d2b..efc2c6d 100644 --- a/.env.sample +++ b/.env.sample @@ -33,3 +33,6 @@ SITE_URL=$REPO_NAME_SNAKE.tld # Multi-site config #WORDPRESS_CONFIG_EXTRA="define('MULTISITE', true); define('SUBDOMAIN_INSTALL', true); define('DOMAIN_CURRENT_SITE', 'frms.localhost'); define('PATH_CURRENT_SITE', '/'); define('SITE_ID_CURRENT_SITE', 1); define('BLOG_ID_CURRENT_SITE', 1); define('SUNRISE', true);" + +# Use composer for plugin installation +#USE_COMPOSER=1 diff --git a/entrypoint.sh b/entrypoint.sh index c877aee..1259022 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -23,12 +23,12 @@ if [ ! -x /usr/local/bin/wp ]; then chmod +x /usr/local/bin/wp fi -if [ ! -x /usr/local/bin/composer ]; then +if [ -n "$USE_COMPOSER" ] && [ ! -x /usr/local/bin/composer ]; then mkdir -p /var/www/.composer chown user:user /var/www/.composer curl https://getcomposer.org/installer -o /tmp/composer-setup.php - php -r "if (hash_file('sha384', '/tmp/composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" + php -r "if (hash_file('sha384', '/tmp/composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" php /tmp/composer-setup.php rm /tmp/composer-setup.php diff --git a/mailhog-smtp.php b/mailhog-smtp.php index 6609372..be9b2e1 100644 --- a/mailhog-smtp.php +++ b/mailhog-smtp.php @@ -19,4 +19,3 @@ add_action('phpmailer_init', function ($phpmailer) { $phpmailer->Username = null; $phpmailer->Password = null; }); -