Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to php8.3 #459

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,34 @@ RUN apk --update --no-cache add \
openssl \
openssh-client \
perl \
php82 \
php82-cli \
php82-ctype \
php82-curl \
php82-dom \
php82-fileinfo \
php82-fpm \
php82-gd \
php82-gmp \
php82-json \
php82-ldap \
php82-mbstring \
php82-mysqlnd \
php82-opcache \
php82-openssl \
php82-pdo \
php82-pdo_mysql \
php82-pecl-memcached \
php82-pear \
php82-phar \
php82-posix \
php82-session \
php82-simplexml \
php82-snmp \
php82-sockets \
php82-tokenizer \
php82-xml \
php82-zip \
php83 \
php83-cli \
php83-ctype \
php83-curl \
php83-dom \
php83-fileinfo \
php83-fpm \
php83-gd \
php83-gmp \
php83-json \
php83-ldap \
php83-mbstring \
php83-mysqlnd \
php83-opcache \
php83-openssl \
php83-pdo \
php83-pdo_mysql \
php83-pecl-memcached \
php83-pear \
php83-phar \
php83-posix \
php83-session \
php83-simplexml \
php83-snmp \
php83-sockets \
php83-tokenizer \
php83-xml \
php83-zip \
python3 \
py3-pip \
rrdtool \
Expand All @@ -73,6 +73,7 @@ RUN apk --update --no-cache add \
tzdata \
util-linux \
whois \
&& ln -s /usr/bin/php83 /usr/bin/php \
&& apk --update --no-cache add -t build-dependencies \
build-base \
make \
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/02-fix-perms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ chown -R librenms:librenms \
/tpls \
/var/lib/nginx \
/var/log/nginx \
/var/log/php82 \
/var/log/php83 \
/var/run/nginx \
/var/run/php-fpm
12 changes: 6 additions & 6 deletions rootfs/etc/cont-init.d/03-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \
-e "s/@FPM_PM_START_SERVERS@/$FPM_PM_START_SERVERS/g" \
-e "s/@FPM_PM_MIN_SPARE_SERVERS@/$FPM_PM_MIN_SPARE_SERVERS/g" \
-e "s/@FPM_PM_MAX_SPARE_SERVERS@/$FPM_PM_MAX_SPARE_SERVERS/g" \
/tpls/etc/php82/php-fpm.d/www.conf >/etc/php82/php-fpm.d/www.conf
/tpls/etc/php83/php-fpm.d/www.conf >/etc/php83/php-fpm.d/www.conf

echo "Setting PHP INI configuration..."
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini
sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php82/php.ini
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php83/php.ini
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php83/php.ini
sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php83/php.ini

# OpCache
echo "Setting OpCache configuration..."
sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
/tpls/etc/php82/conf.d/opcache.ini >/etc/php82/conf.d/opcache.ini
/tpls/etc/php83/conf.d/opcache.ini >/etc/php83/conf.d/opcache.ini

# Nginx
echo "Setting Nginx configuration..."
Expand Down Expand Up @@ -256,4 +256,4 @@ for template in ${templates}; do
fi
echo " Adding ${template} alert template"
ln -sf /data/alert-templates/${template} ${LIBRENMS_PATH}/resources/views/alerts/templates/${template}
done
done
ohai89 marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions rootfs/etc/cont-init.d/04-svc-main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ echo "Database ready!"
counttables=$(echo 'SHOW TABLES' | ${dbcmd} "$DB_NAME" | wc -l)
if [ "${counttables}" -eq "0" ]; then
echo "Enabling First Run Wizard..."
echo "INSTALL=user,finish">> ${LIBRENMS_PATH}/.env
echo "INSTALL=user,finish" >>${LIBRENMS_PATH}/.env
fi

echo "Updating database schema..."
Expand All @@ -99,7 +99,7 @@ cat >/etc/services.d/php-fpm/run <<EOL
#!/usr/bin/execlineb -P
with-contenv
s6-setuidgid ${PUID}:${PGID}
php-fpm82 -F
php-fpm83 -F
EOL
chmod +x /etc/services.d/php-fpm/run

Expand Down
Loading