External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-09 06:32:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

docker: adjust PHP version in apache config

Browse Source 
Signed-off-by: nachoparker <nacho@ownyourbits.com>
This commit is contained in:
nachoparker 2022-03-07 10:17:20 -07:00
parent 21b7fe70f0
commit cd98b50da7
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/ncp-docker-hook Normal file
View File

@ -0,0 +1,11 @@
# Here we have the opportunity to make changes in the persistent volume configuration before
# anything is started, after pulling a new image
# adjust PHP version (in case of php upgrade)
if php --version | grep -q v7.4 && [[ -f /data/etc/apache2/conf-available/php7.3-fpm.conf ]]; then
a2disconf php7.3-fpm
mv /data/etc/apache2/conf-available/php7.{3,4}-fpm.conf
sed -i 's|php7.3|php7.4|g' /data/etc/apache2/conf-available/php7.4-fpm.conf
a2enconf php7.4-fpm
fi

8
build/docker/lamp/010lamp
View File

@ -18,8 +18,14 @@ set -e
# MOVE CONFIGS TO PERSISTENT VOLUME
persistent_cfg /etc/apache2
# Run hardcoded hooks. This allows scripts in the image to change persistent values before
# initialization. Use case is to download a new image.
if [[ -f /usr/local/bin/ncp-docker-hook ]]; then
source /usr/local/bin/ncp-docker-hook
fi
echo "Starting PHP-fpm"
php-fpm${PHPVER}
php-fpm"${PHPVER}"
echo "Starting Apache"
/usr/sbin/apache2ctl start

8
changelog.md
View File

@ -1,9 +1,11 @@
[v1.46.8](https://github.com/nextcloud/nextcloudpi/commit/dc7046b) (2022-03-04) SSH: cannot check for default password because of Debian bug #1003151
[v1.46.9](https://github.com/nextcloud/nextcloudpi/commit/db56128) (2022-03-07) docker: adjust PHP version in apache config
[v1.46.7](https://github.com/nextcloud/nextcloudpi/commit/f473f73) (2022-03-04) nc-hdd-monitor: fix Bullseye service name
[v1.46.8 ](https://github.com/nextcloud/nextcloudpi/commit/21b7fe7) (2022-03-04) SSH: cannot check for default password because of Debian bug #1003151
[v1.46.6](https://github.com/nextcloud/nextcloudpi/commit/c9610e4) (2022-03-03) ncp-dist-upgrade: fix VM grub-pc issue
[v1.46.7 ](https://github.com/nextcloud/nextcloudpi/commit/f473f73) (2022-03-04) nc-hdd-monitor: fix Bullseye service name
[v1.46.6 ](https://github.com/nextcloud/nextcloudpi/commit/c9610e4) (2022-03-03) ncp-dist-upgrade: fix VM grub-pc issue
[v1.46.5 ](https://github.com/nextcloud/nextcloudpi/commit/062c803) (2022-03-02) ncp-dist-upgrade: add DHCP fix for raspios