3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 06:25:30 +00:00

Attempted fix of #18291 - update PHP versions and alpine versions

This commit is contained in:
snipe
2026-01-05 14:05:47 +00:00
parent 0af45a53a9
commit 32f0101c1b
4 changed files with 33 additions and 30 deletions

View File

@ -1,35 +1,35 @@
FROM alpine:3.19 FROM alpine:3.23
# Apache + PHP # Apache + PHP
RUN apk add --no-cache \ RUN apk add --no-cache \
apache2 \ apache2 \
php82 \ php83 \
php82-common \ php83-common \
php82-apache2 \ php83-apache2 \
php82-curl \ php83-curl \
php82-ldap \ php83-ldap \
php82-mysqli \ php83-mysqli \
php82-gd \ php83-gd \
php82-xml \ php83-xml \
php82-mbstring \ php83-mbstring \
php82-zip \ php83-zip \
php82-ctype \ php83-ctype \
php82-tokenizer \ php83-tokenizer \
php82-pdo_mysql \ php83-pdo_mysql \
php82-openssl \ php83-openssl \
php82-bcmath \ php83-bcmath \
php82-phar \ php83-phar \
php82-json \ php83-json \
php82-iconv \ php83-iconv \
php82-fileinfo \ php83-fileinfo \
php82-simplexml \ php83-simplexml \
php82-session \ php83-session \
php82-dom \ php83-dom \
php82-xmlwriter \ php83-xmlwriter \
php82-xmlreader \ php83-xmlreader \
php82-sodium \ php83-sodium \
php82-redis \ php83-redis \
php82-pecl-memcached \ php83-pecl-memcached \
php82-exif \ php83-exif \
curl \ curl \
wget \ wget \
vim \ vim \
@ -42,7 +42,7 @@ COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
# Where apache's PID lives # Where apache's PID lives
RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2 RUN 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.ini
COPY docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf COPY docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf
# Enable mod_rewrite # Enable mod_rewrite

View File

@ -83,6 +83,7 @@ for dir in \
'data/uploads/consumables' \ 'data/uploads/consumables' \
'data/uploads/departments' \ 'data/uploads/departments' \
'data/uploads/locations' \ 'data/uploads/locations' \
'data/uploads/maintenances' \
'data/uploads/manufacturers' \ 'data/uploads/manufacturers' \
'data/uploads/models' \ 'data/uploads/models' \
'data/uploads/suppliers' \ 'data/uploads/suppliers' \

View File

@ -67,6 +67,7 @@ for dir in \
'data/uploads/consumables' \ 'data/uploads/consumables' \
'data/uploads/departments' \ 'data/uploads/departments' \
'data/uploads/locations' \ 'data/uploads/locations' \
'data/uploads/maintenances' \
'data/uploads/manufacturers' \ 'data/uploads/manufacturers' \
'data/uploads/models' \ 'data/uploads/models' \
'data/uploads/suppliers' \ 'data/uploads/suppliers' \

View File

@ -72,6 +72,7 @@ for dir in \
'data/uploads/consumables' \ 'data/uploads/consumables' \
'data/uploads/departments' \ 'data/uploads/departments' \
'data/uploads/locations' \ 'data/uploads/locations' \
'data/uploads/maintenances' \
'data/uploads/manufacturers' \ 'data/uploads/manufacturers' \
'data/uploads/models' \ 'data/uploads/models' \
'data/uploads/suppliers' \ 'data/uploads/suppliers' \