[laravel-s]Made some optimizations (#6324)

* unify port

* optimize composer

Co-authored-by: 谢彪 <[email protected]>

frameworks/PHP/laravel/benchmark_config.json

@@ -54,7 +54,7 @@
 			"fortune_url": "/fortunes",
 			"update_url": "/updates/",
 			"plaintext_url": "/plaintext",
-			"port": 5200,
+			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
 			"database": "MySQL",

frameworks/PHP/laravel/deploy/laravel-s/install-composer.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-EXPECTED_SIGNATURE="$(curl -s https://composer.github.io/installer.sig)"
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-ACTUAL_SIGNATURE="$(php -r "echo hash_file('SHA384', 'composer-setup.php');")"
-
-if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
-then
-    >&2 echo 'ERROR: Invalid installer signature'
-    rm composer-setup.php
-    exit 1
-fi
-
-php composer-setup.php --quiet
-RESULT=$?
-rm composer-setup.php
-exit $RESULT

frameworks/PHP/laravel/laravel-laravel-s.dockerfile

@@ -14,18 +14,20 @@ WORKDIR /laravel
 RUN mkdir -p /laravel/bootstrap/cache /laravel/storage/logs /laravel/storage/framework/sessions /laravel/storage/framework/views /laravel/storage/framework/cache
 RUN chmod -R 777 /laravel
 
-RUN deploy/swoole/install-composer.sh
 RUN apt-get update > /dev/null && \
     apt-get install -yqq git unzip > /dev/null
-COPY deploy/laravel-s/composer* ./
+RUN php -r "copy('https://install.phpcomposer.com/installer', 'composer-setup.php');" && php composer-setup.php && php -r "unlink('composer-setup.php');"
+RUN mv composer.phar /usr/local/bin/composer
+
+COPY deploy/laravel-s/composer.json ./
 
 RUN echo "LARAVELS_LISTEN_IP=0.0.0.0" >> .env
-RUN echo "LARAVELS_LISTEN_PORT=5200" >> .env
+RUN echo "LARAVELS_LISTEN_PORT=8080" >> .env
 
-RUN php composer.phar install -a --no-dev --quiet
+RUN composer install -a --no-dev --quiet
 RUN php artisan optimize
 RUN php artisan laravels publish
 
-EXPOSE 5200
+EXPOSE 8080
 
-CMD bin/laravels start
+CMD php bin/laravels start

frameworks/PHP/lumen/benchmark_config.json

@@ -54,7 +54,7 @@
 			"fortune_url": "/fortunes",
 			"update_url": "/updates/",
 			"plaintext_url": "/plaintext",
-			"port": 5200,
+			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Micro",
 			"database": "MySQL",

frameworks/PHP/lumen/deploy/laravel-s/install-composer.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-EXPECTED_SIGNATURE="$(curl -s https://composer.github.io/installer.sig)"
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-ACTUAL_SIGNATURE="$(php -r "echo hash_file('SHA384', 'composer-setup.php');")"
-
-if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
-then
-    >&2 echo 'ERROR: Invalid installer signature'
-    rm composer-setup.php
-    exit 1
-fi
-
-php composer-setup.php --quiet
-RESULT=$?
-rm composer-setup.php
-exit $RESULT

frameworks/PHP/lumen/lumen-laravel-s.dockerfile

@@ -14,17 +14,19 @@ WORKDIR /lumen
 RUN mkdir -p /lumen/bootstrap/cache /lumen/storage/logs /lumen/storage/framework/sessions /lumen/storage/framework/views /lumen/storage/framework/cache
 RUN chmod -R 777 /lumen
 
-RUN deploy/swoole/install-composer.sh
 RUN apt-get update > /dev/null && \
     apt-get install -yqq git unzip > /dev/null
-COPY deploy/laravel-s/composer* ./
+RUN php -r "copy('https://install.phpcomposer.com/installer', 'composer-setup.php');" && php composer-setup.php && php -r "unlink('composer-setup.php');"
+RUN mv composer.phar /usr/local/bin/composer
+
+COPY deploy/laravel-s/composer.json ./
 
 RUN echo "LARAVELS_LISTEN_IP=0.0.0.0" >> .env
-RUN echo "LARAVELS_LISTEN_PORT=5200" >> .env
+RUN echo "LARAVELS_LISTEN_PORT=8080" >> .env
 
-RUN php composer.phar install -a --no-dev --quiet
+RUN composer install -a --no-dev --quiet
 RUN php artisan laravels publish
 
-EXPOSE 5200
+EXPOSE 8080
 
-CMD bin/laravels start
+CMD php bin/laravels start