diff --git a/frameworks/PHP/php/php-h2o.dockerfile b/frameworks/PHP/php/php-h2o.dockerfile index e66307ba85e..a722b660011 100644 --- a/frameworks/PHP/php/php-h2o.dockerfile +++ b/frameworks/PHP/php/php-h2o.dockerfile @@ -2,15 +2,16 @@ ARG UBUNTU_VERSION=24.04 ARG H2O_PREFIX=/opt/h2o -FROM "ubuntu:${UBUNTU_VERSION}" AS compile +FROM "buildpack-deps:${UBUNTU_VERSION}" AS compile ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402 ARG DEBIAN_FRONTEND=noninteractive ARG H2O_PREFIX WORKDIR /tmp/h2o-build -RUN apt-get -yqq update > /dev/null && \ - apt-get -yqq install \ +RUN apt-get install \ + --no-install-recommends \ + -qqUy \ cmake \ curl \ g++ \ @@ -21,6 +22,7 @@ RUN apt-get -yqq update > /dev/null && \ libuv1-dev \ libwslay-dev \ libz-dev \ + make \ ninja-build \ pkg-config \ ruby \ @@ -29,10 +31,8 @@ RUN apt-get -yqq update > /dev/null && \ tar --strip-components=1 -xz > /dev/null && \ cmake \ -B build \ - -DCMAKE_AR=/usr/bin/gcc-ar \ -DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \ -DCMAKE_INSTALL_PREFIX="${H2O_PREFIX}" \ - -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \ -DWITH_MRUBY=on \ -G Ninja \ -S . > /dev/null && \ @@ -46,13 +46,15 @@ ARG PHP_VERSION=8.4 ENV TZ=America/Los_Angeles ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get -yqq update > /dev/null && \ - apt-get -yqq install \ +RUN apt-get install \ + --no-install-recommends \ + -qqUy \ apt-utils \ software-properties-common > /dev/null && \ LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \ - apt-get -yqq update > /dev/null && \ - apt-get -yqq install \ + apt-get install \ + --no-install-recommends \ + -qqUy \ liburing2 \ "php${PHP_VERSION}" \ "php${PHP_VERSION}-cli" \ diff --git a/frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile b/frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile index 5f7823bcd13..aaf6a6eaa96 100644 --- a/frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile +++ b/frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile @@ -2,15 +2,16 @@ ARG UBUNTU_VERSION=25.10 ARG H2O_PREFIX=/opt/h2o -FROM "ubuntu:${UBUNTU_VERSION}" AS compile +FROM "buildpack-deps:${UBUNTU_VERSION}" AS compile ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402 ARG DEBIAN_FRONTEND=noninteractive ARG H2O_PREFIX WORKDIR /tmp/h2o-build -RUN apt-get -yqq update && \ - apt-get -yqq install \ +RUN apt-get install \ + --no-install-recommends \ + -qqUy \ cmake \ curl \ g++ \ @@ -21,6 +22,7 @@ RUN apt-get -yqq update && \ libuv1-dev \ libwslay-dev \ libz-dev \ + make \ ninja-build \ pkg-config \ ruby \ @@ -29,10 +31,8 @@ RUN apt-get -yqq update && \ tar --strip-components=1 -xz && \ cmake \ -B build \ - -DCMAKE_AR=/usr/bin/gcc-ar \ -DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \ -DCMAKE_INSTALL_PREFIX="${H2O_PREFIX}" \ - -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \ -DWITH_MRUBY=on \ -G Ninja \ -S . && \ @@ -42,7 +42,7 @@ RUN apt-get -yqq update && \ FROM "ubuntu:${UBUNTU_VERSION}" ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get -yqq update && apt-get -yqq install liburing2 +RUN apt-get install --no-install-recommends -qqUy liburing2 ARG H2O_PREFIX COPY --from=compile "${H2O_PREFIX}/bin/h2o" "${H2O_PREFIX}/bin/" COPY --from=compile "${H2O_PREFIX}/share" "${H2O_PREFIX}/share/"