Merge pull request #15151 from snipe/snyk-fix-067da5564c4d29b025cd356b125e6ad9

[Snyk] Security upgrade alpine from 3.18.6 to 3.19
This commit is contained in:
snipe 2024-07-24 14:22:57 +01:00 committed by GitHub
commit e5ab12496f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,35 +1,35 @@
FROM alpine:3.18.6 FROM alpine:3.19
# Apache + PHP # Apache + PHP
RUN apk add --no-cache \ RUN apk add --no-cache \
apache2 \ apache2 \
php81 \ php82 \
php81-common \ php82-common \
php81-apache2 \ php82-apache2 \
php81-curl \ php82-curl \
php81-ldap \ php82-ldap \
php81-mysqli \ php82-mysqli \
php81-gd \ php82-gd \
php81-xml \ php82-xml \
php81-mbstring \ php82-mbstring \
php81-zip \ php82-zip \
php81-ctype \ php82-ctype \
php81-tokenizer \ php82-tokenizer \
php81-pdo_mysql \ php82-pdo_mysql \
php81-openssl \ php82-openssl \
php81-bcmath \ php82-bcmath \
php81-phar \ php82-phar \
php81-json \ php82-json \
php81-iconv \ php82-iconv \
php81-fileinfo \ php82-fileinfo \
php81-simplexml \ php82-simplexml \
php81-session \ php82-session \
php81-dom \ php82-dom \
php81-xmlwriter \ php82-xmlwriter \
php81-xmlreader \ php82-xmlreader \
php81-sodium \ php82-sodium \
php81-redis \ php82-redis \
php81-pecl-memcached \ php82-pecl-memcached \
php81-exif \ php82-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/php81/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php82/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