diff --git a/CHANGELOG.md b/CHANGELOG.md index b95b8aa..d437510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 2022-01-19 + +* Provide a filebin `3.6.2` version utilizing PHP8 + * Docker images with PHP8 are suffixed with `-php8` + * PHP8 versions will be the default for all upcoming releases `> 3.6.2` and no PHP7 version will be maintained anymore + ## 2022-01-18 * Updated to filebin `3.6.2` diff --git a/Dockerfile b/Dockerfile index 19c5f47..2f62d41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,30 +71,28 @@ RUN chmod -x /wait-for.sh && \ ghostscript \ msmtp \ composer \ - php7 \ - php7-fpm \ - php7-cli \ - php7-intl \ - php7-curl \ - php7-json \ - php7-dom \ - php7-pcntl \ - php7-posix \ - php7-mcrypt \ - php7-session \ - php7-gd \ - php7-exif \ - php7-phar \ - php7-pdo \ - php7-pgsql \ - php7-pdo_pgsql \ - php7-pdo_mysql \ - php7-mysqli \ - php7-fileinfo \ - php7-mbstring \ - php7-ctype \ - php7-ldap \ - php7-pecl-memcached \ + php8 \ + php8-fpm \ + php8-intl \ + php8-curl \ + php8-dom \ + php8-pcntl \ + php8-posix \ + php8-pecl-mcrypt \ + php8-session \ + php8-gd \ + php8-exif \ + php8-phar \ + php8-pdo \ + php8-pgsql \ + php8-pdo_pgsql \ + php8-pdo_mysql \ + php8-mysqli \ + php8-fileinfo \ + php8-mbstring \ + php8-ctype \ + php8-ldap \ + php8-pecl-memcached \ memcached \ ca-certificates && \ rm -rf /var/cache/apk/* && \ @@ -102,15 +100,16 @@ RUN chmod -x /wait-for.sh && \ # prepare www dir cp -r /var/www/application/config/example/* /var/www/application/config && \ # set environments - sed -i "s|;*memory_limit =.*|memory_limit = ${PHP_MEMORY_LIMIT}|i" /etc/php7/php.ini && \ - sed -i "s|;*upload_max_filesize =.*|upload_max_filesize = ${MAX_UPLOAD}|i" /etc/php7/php.ini && \ - sed -i "s|;*max_file_uploads =.*|max_file_uploads = ${PHP_MAX_FILE_UPLOAD}|i" /etc/php7/php.ini && \ - sed -i "s|;*post_max_size =.*|post_max_size = ${PHP_MAX_POST}|i" /etc/php7/php.ini && \ - sed -i 's+.*sendmail_path =.*+sendmail_path = "/usr/bin/msmtp -C /var/www/msmtprc --logfile /var/www/msmtp.log -a filebinmail -t"+' /etc/php7/php.ini && \ + sed -i "s|;*memory_limit =.*|memory_limit = ${PHP_MEMORY_LIMIT}|i" /etc/php8/php.ini && \ + sed -i "s|;*upload_max_filesize =.*|upload_max_filesize = ${MAX_UPLOAD}|i" /etc/php8/php.ini && \ + sed -i "s|;*max_file_uploads =.*|max_file_uploads = ${PHP_MAX_FILE_UPLOAD}|i" /etc/php8/php.ini && \ + sed -i "s|;*post_max_size =.*|post_max_size = ${PHP_MAX_POST}|i" /etc/php8/php.ini && \ + sed -i 's+.*sendmail_path =.*+sendmail_path = "/usr/bin/msmtp -C /var/www/msmtprc --logfile /var/www/msmtp.log -a filebinmail -t"+' /etc/php8/php.ini && \ # clean up and permissions rm -rf /var/cache/apk/* && \ ln -s /usr/bin/python3 /usr/bin/python && \ - chown nobody:nginx -R /var/www + chown nobody:nginx -R /var/www && \ + ln -s /usr/bin/php8 /usr/bin/php # Add nginx config ADD src/filebin.nginx.conf /etc/nginx/nginx.conf @@ -129,4 +128,4 @@ ADD src/configure-mail.sh /var/www/configure-mail.sh ADD src/s6/ /etc/s6/ # expose start -CMD php /configure.php && exec s6-svscan /etc/s6/ +CMD /usr/bin/php /configure.php && exec s6-svscan /etc/s6/ diff --git a/src/s6/php-fpm/run b/src/s6/php-fpm/run index 93f71b9..5295294 100755 --- a/src/s6/php-fpm/run +++ b/src/s6/php-fpm/run @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/sbin/php-fpm7 --nodaemonize +exec /usr/sbin/php-fpm8 --nodaemonize