Niklas Keller 5 years ago
parent
commit
e66066bd49

+ 4 - 4
frameworks/PHP/amp/amp.dockerfile

@@ -1,11 +1,11 @@
-FROM ubuntu:19.04
+FROM ubuntu:20.04
 
 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 git unzip php7.3 php7.3-common php7.3-cli php7.3-dev php7.3-mbstring composer curl build-essential > /dev/null
+    apt-get install -yqq git unzip php7.4 php7.4-common php7.4-cli php7.4-dev php7.4-mbstring composer curl build-essential > /dev/null
 
 # An extension is required!
 # We deal with concurrencies over 1k, which stream_select doesn't support.
@@ -16,8 +16,8 @@ RUN pecl install uv-0.2.4 > /dev/null
 ADD ./ /amp
 WORKDIR /amp
 
-COPY deploy/conf/* /etc/php/7.3/cli/conf.d/
+COPY deploy/conf/* /etc/php/7.4/cli/conf.d/
 
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
+RUN composer install --prefer-dist --optimize-autoloader --no-dev
 
 CMD php /amp/vendor/bin/cluster /amp/server.php

+ 1 - 2
frameworks/PHP/amp/benchmark_config.json

@@ -21,8 +21,7 @@
       "database_os": "Linux",
       "display_name": "amp",
       "notes": "",
-      "versus": "php",
-      "tags": ["broken"]
+      "versus": "php"
     }
   }]
 }

+ 2 - 2
frameworks/PHP/amp/composer.json

@@ -1,8 +1,8 @@
 {
     "require": {
         "amphp/cluster": "^1",
-        "amphp/http-server": "^2.0.0-rc2",
+        "amphp/http-server": "^2",
         "amphp/http-server-router": "^1",
-        "amphp/mysql": "dev-master#59086f7acc3151eea92e062ece6f21516aff28a5"
+        "amphp/mysql": "^2"
     }
 }