From 93df532ba36013e453780eb8308d89c16bf64fa2 Mon Sep 17 00:00:00 2001 From: Joan Miquel Date: Sun, 24 Jan 2021 00:36:49 +0100 Subject: [PATCH] Fix larvel-s to not use JIT (#6314) * Fix larvel-s to not use JIT #6184 * Clean dockerfiles * Use php:8.0-cli image --- frameworks/PHP/laravel/laravel-laravel-s.dockerfile | 6 +++--- frameworks/PHP/laravel/laravel.dockerfile | 3 ++- frameworks/PHP/lumen/lumen-laravel-s.dockerfile | 6 +++--- frameworks/PHP/lumen/lumen.dockerfile | 3 ++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/frameworks/PHP/laravel/laravel-laravel-s.dockerfile b/frameworks/PHP/laravel/laravel-laravel-s.dockerfile index ff3457f4685..32325c2fff3 100644 --- a/frameworks/PHP/laravel/laravel-laravel-s.dockerfile +++ b/frameworks/PHP/laravel/laravel-laravel-s.dockerfile @@ -1,12 +1,12 @@ -FROM php:8.0 +FROM php:8.0-cli RUN pecl install swoole > /dev/null && \ docker-php-ext-enable swoole RUN docker-php-ext-install pdo_mysql pcntl opcache > /dev/null RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini -RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini -RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini +#RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini +#RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini ADD ./ /laravel WORKDIR /laravel diff --git a/frameworks/PHP/laravel/laravel.dockerfile b/frameworks/PHP/laravel/laravel.dockerfile index d5111a2342c..06a32025277 100644 --- a/frameworks/PHP/laravel/laravel.dockerfile +++ b/frameworks/PHP/laravel/laravel.dockerfile @@ -5,7 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php RUN apt-get update -yqq > /dev/null && \ - apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql > /dev/null + apt-get install -yqq nginx git unzip \ + php8.0-cli php8.0-fpm php8.0-mysql > /dev/null RUN apt-get install -yqq php8.0-mbstring php8.0-xml > /dev/null RUN apt-get install -yqq composer > /dev/null diff --git a/frameworks/PHP/lumen/lumen-laravel-s.dockerfile b/frameworks/PHP/lumen/lumen-laravel-s.dockerfile index 9da385804fb..e30883a2e0a 100644 --- a/frameworks/PHP/lumen/lumen-laravel-s.dockerfile +++ b/frameworks/PHP/lumen/lumen-laravel-s.dockerfile @@ -1,12 +1,12 @@ -FROM php:8.0 +FROM php:8.0-cli RUN pecl install swoole > /dev/null && \ docker-php-ext-enable swoole RUN docker-php-ext-install pdo_mysql pcntl opcache > /dev/null RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini -RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini -RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini +#RUN echo "opcache.jit=1205" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini +#RUN echo "opcache.jit_buffer_size=128M" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini ADD ./ /lumen WORKDIR /lumen diff --git a/frameworks/PHP/lumen/lumen.dockerfile b/frameworks/PHP/lumen/lumen.dockerfile index fb4c92e346a..3b82aed44dc 100644 --- a/frameworks/PHP/lumen/lumen.dockerfile +++ b/frameworks/PHP/lumen/lumen.dockerfile @@ -5,7 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php RUN apt-get update -yqq > /dev/null && \ - apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql > /dev/null + apt-get install -yqq nginx git unzip \ + php8.0-cli php8.0-fpm php8.0-mysql > /dev/null RUN apt-get install -yqq php8.0-mbstring php8.0-xml > /dev/null RUN apt-get install -yqq composer > /dev/null