Selaa lähdekoodia

Php update laravel and fat-free (#4276)

* Update fat-free to v3.6.4
Donwload only that branch for faster build
Try to fix the update test

* Laravel update to v5.7.*
Try to fix the update test

* Use composer without dev dependencies
Joan Miquel 6 vuotta sitten
vanhempi
commit
95bab4d970

+ 1 - 2
frameworks/PHP/fat-free/fat-free-raw.dockerfile

@@ -14,8 +14,7 @@ WORKDIR /fat-free
 
 ENV F3DIR="/fat-free/src"
 
-RUN git clone "https://github.com/bcosca/fatfree-core.git" src
-RUN cd src && git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
+RUN git clone -b 3.6.4 --single-branch --depth 1 "https://github.com/bcosca/fatfree-core.git" src
 
 RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
 

+ 1 - 2
frameworks/PHP/fat-free/fat-free.dockerfile

@@ -14,8 +14,7 @@ WORKDIR /fat-free
 
 ENV F3DIR="/fat-free/src"
 
-RUN git clone "https://github.com/bcosca/fatfree-core.git" src
-RUN cd src && git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
+RUN git clone -b 3.6.4 --single-branch --depth 1 "https://github.com/bcosca/fatfree-core.git" src
 
 RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
 

+ 1 - 1
frameworks/PHP/laravel/composer.json

@@ -7,7 +7,7 @@
     "require": {
         "php": ">=7.1.3",
         "fideloper/proxy": "~4.0",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/tinker": "~1.0"
     },
     "require-dev": {

+ 1 - 1
frameworks/PHP/laravel/laravel-swoole.dockerfile

@@ -31,7 +31,7 @@ RUN deploy/swoole/install-composer.sh
 RUN apt-get update -yqq  > /dev/null
 RUN apt-get install -yqq git unzip > /dev/null
 COPY deploy/swoole/composer* ./
-RUN php composer.phar install --quiet
+RUN php composer.phar install --no-dev --quiet
 
 RUN php artisan config:cache
 RUN php artisan route:cache

+ 1 - 1
frameworks/PHP/lumen/lumen-swoole.dockerfile

@@ -28,7 +28,7 @@ RUN deploy/swoole/install-composer.sh
 RUN apt-get update -yqq  > /dev/null
 RUN apt-get install -yqq git unzip > /dev/null
 COPY deploy/swoole/composer* ./
-RUN php composer.phar install --quiet
+RUN php composer.phar install --no-dev --quiet
 
 RUN echo "APP_SWOOLE=true" >> .env