diff --git a/docker/8.5/Dockerfile b/docker/8.5/Dockerfile index dfa4cb82f..0271f992e 100644 --- a/docker/8.5/Dockerfile +++ b/docker/8.5/Dockerfile @@ -26,9 +26,6 @@ RUN apt-get update \ && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \ && echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ - && curl -fsSL https://extras.getpagespeed.com/deb-archive-keyring.gpg -o /etc/apt/keyrings/getpagespeed.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/getpagespeed.gpg] https://extras.getpagespeed.com/ubuntu noble main" > /etc/apt/sources.list.d/getpagespeed.list \ - && printf 'Package: *\nPin: origin extras.getpagespeed.com\nPin-Priority: 1001\n' > /etc/apt/preferences.d/getpagespeed-nginx.pref \ && apt-get update # Install core PHP packages @@ -53,8 +50,8 @@ RUN apt-get install -y \ sudo jq htop fonts-powerline nano bash-completion time wget cron \ jpegoptim webp optipng pngquant libavif-bin -# Install nginx + brotli module from GetPageSpeed (apt-pinned, stable branch) -RUN apt-get install -y nginx nginx-module-brotli \ +# Install nginx from Ubuntu repositories +RUN apt-get install -y nginx \ && rm -f /etc/nginx/conf.d/default.conf \ && nginx -t diff --git a/docker/8.5/nginx.conf b/docker/8.5/nginx.conf index 42b80a069..bbe119048 100644 --- a/docker/8.5/nginx.conf +++ b/docker/8.5/nginx.conf @@ -12,16 +12,6 @@ server { gzip_proxied any; gzip_comp_level 6; - # Brotli compression (provided by GetPageSpeed nginx-module-brotli package) - brotli on; - brotli_comp_level 6; - brotli_static on; - brotli_types application/atom+xml application/javascript application/json application/rss+xml - application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype - application/x-font-ttf application/x-javascript application/xhtml+xml application/xml - font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon - image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml text/html; - location / { try_files $uri $uri/ /index.php?$query_string; }