diff --git a/Dockerfile b/Dockerfile index f580cc2..9d4f4ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN dnf install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False gcc- FROM builder AS php-build COPY bin/misp_compile_php_extensions.sh bin/misp_enable_epel.sh /build/ RUN --mount=type=tmpfs,target=/tmp \ + dnf install -y almalinux-release-testing && \ dnf module enable -y php:$PHP_VERSION && \ bash /build/misp_enable_epel.sh && \ bash /build/misp_compile_php_extensions.sh @@ -40,6 +41,7 @@ COPY bin/misp_enable_epel.sh bin/misp_enable_vector.sh /usr/local/bin/ RUN --mount=type=tmpfs,target=/var/cache/dnf \ bash /usr/local/bin/misp_enable_epel.sh && \ bash /usr/local/bin/misp_enable_vector.sh && \ + dnf install -y almalinux-release-testing && \ dnf module -y enable php:$PHP_VERSION && \ dnf install --setopt=tsflags=nodocs --setopt=install_weak_deps=False -y $(grep -vE "^\s*#" /tmp/packages | tr "\n" " ") && \ pip3.12 --no-cache-dir install --disable-pip-version-check -r /tmp/requirements.txt && \ diff --git a/bin/misp_install.sh b/bin/misp_install.sh index 12e95af..bdd0734 100644 --- a/bin/misp_install.sh +++ b/bin/misp_install.sh @@ -29,7 +29,7 @@ sed -e 's/;assert.active = On/assert.active = Off/' -i ${PHP_INI} sed -e 's/expose_php = On/expose_php = Off/' -i ${PHP_INI} sed -e 's/session.sid_length = 26/session.sid_length = 32/' -i ${PHP_INI} sed -e 's/session.use_strict_mode = 0/session.use_strict_mode = 1/' -i ${PHP_INI} -sed -e 's/;session.upload_progress.enabled = On/session.upload_progress.enabled = Off/' -i ${PHP_INI} # Possible workaround (not confirmed) for CVE-2026-109618 and CVE-2026-109619, but we don't need it anyway +sed -e 's/;session.upload_progress.enabled = On/session.upload_progress.enabled = Off/' -i ${PHP_INI} # Partial workaround for CVE-2026-109618 and CVE-2026-109619, but we don't need `upload_progress` anyway so it is better to keep it disabled sed -e 's/pcre.jit=0/pcre.jit=1/' -i ${PHP_INI} sed -e 's/opcache.enable_cli=1/opcache.enable_cli=0/' -i /etc/php.d/10-opcache.ini # use igbinary serializer for apcu and sessions