Browse Source

[php] Fix fuel (#6798)

Joan Miquel 3 years ago
parent
commit
b98bfa16eb

+ 1 - 1
frameworks/PHP/fuel/benchmark_config.json

@@ -12,7 +12,7 @@
       "database": "MySQL",
       "database": "MySQL",
       "framework": "Fuel",
       "framework": "Fuel",
       "language": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8",
       "orm": "Raw",
       "orm": "Raw",
       "platform": "FPM/FastCGI",
       "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "webserver": "nginx",

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

@@ -1,6 +1,6 @@
 {
 {
   "require": {
   "require": {
-    "composer/installers": "~1.0",
+    "composer/installers": "~1",
     "fuel/core": "~1.8",
     "fuel/core": "~1.8",
     "fuel/auth": "~1.8",
     "fuel/auth": "~1.8",
     "fuel/parser": "~1.8",
     "fuel/parser": "~1.8",

+ 1 - 1
frameworks/PHP/fuel/fuel.dockerfile

@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 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 php8.0-xml php8.0-mbstring php7.0-mcrypt  > /dev/null
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql php8.0-xml php8.0-mbstring php7.0-mcrypt  > /dev/null
 
 
-COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:1.10.22 /usr/bin/composer /usr/local/bin/composer
 
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 COPY deploy/conf/* /etc/php/8.0/fpm/