A free open source IT asset/license management system
Attempted fix of #18291 - update PHP versions and alpine versions
snipe32f0101c1b17
diff --git a/Dockerfile.alpine b/Dockerfile.alpineindex 5df4b6d06a..f476c3bc6e 100644--- a/Dockerfile.alpine+++ b/Dockerfile.alpine@@ -1,35 +1,35 @@-FROM alpine:3.19+FROM alpine:3.23# Apache + PHPRUN apk add --no-cache \apache2 \- php82 \- php82-common \- php82-apache2 \- php82-curl \- php82-ldap \- php82-mysqli \- php82-gd \- php82-xml \- php82-mbstring \- php82-zip \- php82-ctype \- php82-tokenizer \- php82-pdo_mysql \- php82-openssl \- php82-bcmath \- php82-phar \- php82-json \- php82-iconv \- php82-fileinfo \- php82-simplexml \- php82-session \- php82-dom \- php82-xmlwriter \- php82-xmlreader \- php82-sodium \- php82-redis \- php82-pecl-memcached \- php82-exif \+ php83 \+ php83-common \+ php83-apache2 \+ php83-curl \+ php83-ldap \+ php83-mysqli \+ php83-gd \+ php83-xml \+ php83-mbstring \+ php83-zip \+ php83-ctype \+ php83-tokenizer \+ php83-pdo_mysql \+ php83-openssl \+ php83-bcmath \+ php83-phar \+ php83-json \+ php83-iconv \+ php83-fileinfo \+ php83-simplexml \+ php83-session \+ php83-dom \+ php83-xmlwriter \+ php83-xmlreader \+ php83-sodium \+ php83-redis \+ php83-pecl-memcached \+ php83-exif \curl \wget \vim \@@ -42,7 +42,7 @@ COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf# Where apache's PID livesRUN mkdir -p /run/apache2 && chown apache:apache /run/apache2-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php82/php.ini+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php83/php.iniCOPY docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf# Enable mod_rewritediff --git a/docker/startup.sh b/docker/startup.shindex c0edd5cf46..2c6f39f812 100644--- a/docker/startup.sh+++ b/docker/startup.sh@@ -83,6 +83,7 @@ for dir in \'data/uploads/consumables' \'data/uploads/departments' \'data/uploads/locations' \+ 'data/uploads/maintenances' \'data/uploads/manufacturers' \'data/uploads/models' \'data/uploads/suppliers' \diff --git a/docker/startup_alpine.sh b/docker/startup_alpine.shindex bb9574f387..26ae61b893 100644--- a/docker/startup_alpine.sh+++ b/docker/startup_alpine.sh@@ -67,6 +67,7 @@ for dir in \'data/uploads/consumables' \'data/uploads/departments' \'data/uploads/locations' \+ 'data/uploads/maintenances' \'data/uploads/manufacturers' \'data/uploads/models' \'data/uploads/suppliers' \diff --git a/docker/startup_alpine_fpm.sh b/docker/startup_alpine_fpm.shindex 981d8bb4f8..d4176248f7 100755--- a/docker/startup_alpine_fpm.sh+++ b/docker/startup_alpine_fpm.sh@@ -72,6 +72,7 @@ for dir in \'data/uploads/consumables' \'data/uploads/departments' \'data/uploads/locations' \+ 'data/uploads/maintenances' \'data/uploads/manufacturers' \'data/uploads/models' \'data/uploads/suppliers' \