diff --git a/CHANGELOG.md b/CHANGELOG.md index ef2f48f..c8f6d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 2022-12-16 + +* Update docker image packages + ## 2022-06-01 * Provide a filebin `4.0.0` version utilizing PHP8 diff --git a/Dockerfile b/Dockerfile index b397ac1..7b4df3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,28 +71,27 @@ RUN chmod -x /wait-for.sh && \ ghostscript \ msmtp \ composer \ - 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 \ + php81 \ + php81-fpm \ + php81-intl \ + php81-curl \ + php81-dom \ + php81-pcntl \ + php81-posix \ + php81-session \ + php81-gd \ + php81-exif \ + php81-phar \ + php81-pdo \ + php81-pgsql \ + php81-pdo_pgsql \ + php81-pdo_mysql \ + php81-mysqli \ + php81-fileinfo \ + php81-mbstring \ + php81-ctype \ + php81-ldap \ + php81-pecl-memcached \ memcached \ ca-certificates && \ rm -rf /var/cache/apk/* && \ @@ -100,17 +99,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/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 && \ + sed -i "s|;*memory_limit =.*|memory_limit = ${PHP_MEMORY_LIMIT}|i" /etc/php81/php.ini && \ + sed -i "s|;*upload_max_filesize =.*|upload_max_filesize = ${MAX_UPLOAD}|i" /etc/php81/php.ini && \ + sed -i "s|;*max_file_uploads =.*|max_file_uploads = ${PHP_MAX_FILE_UPLOAD}|i" /etc/php81/php.ini && \ + sed -i "s|;*post_max_size =.*|post_max_size = ${PHP_MAX_POST}|i" /etc/php81/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/php81/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 && \ rm /usr/bin/php && \ - ln -s /usr/bin/php8 /usr/bin/php + ln -s /usr/bin/php81 /usr/bin/php # Add nginx config ADD src/filebin.nginx.conf /etc/nginx/nginx.conf diff --git a/docker-compose.yml b/docker-compose.yml index 9aba1d1..47d0a58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ networks: services: db: - image: postgres:11 + image: postgres:15 container_name: filebin_db environment: - POSTGRES_PASSWORD=fb diff --git a/src/s6/php-fpm/run b/src/s6/php-fpm/run index 5295294..bd4199b 100755 --- a/src/s6/php-fpm/run +++ b/src/s6/php-fpm/run @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/sbin/php-fpm8 --nodaemonize +exec /usr/sbin/php-fpm81 --nodaemonize