From 213f3fc62890243e5b84241470a05b1efe4d32f9 Mon Sep 17 00:00:00 2001
From: "Eldad A. Fux" <eldad.fux@gmail.com>
Date: Tue, 27 Oct 2020 08:12:00 +0200
Subject: [PATCH 1/3] Feat install phpredis with git (#710)

* Use git to install all extensions
* Updated maxmind version
---
 Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b394d5b13..fbab296af5 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,8 @@ FROM php:7.4-cli-alpine as step1
 
 ENV TZ=Asia/Tel_Aviv \
     PHP_REDIS_VERSION=5.3.0 \
-    PHP_SWOOLE_VERSION=4.5.6 \
+    PHP_SWOOLE_VERSION=v4.5.6 \
+    PHP_MAXMINDDB_VERSION=v1.8.0 \
     PHP_XDEBUG_VERSION=sdebug_2_9-beta
 
 RUN \
@@ -26,8 +27,6 @@ RUN \
   autoconf \
   gcc \
   g++ \
-  tar \
-  wget \
   git \
   zlib-dev \
   brotli-dev \
@@ -37,9 +36,9 @@ RUN docker-php-ext-install sockets
 
 RUN \
   # Redis Extension
-  wget -q https://github.com/phpredis/phpredis/archive/$PHP_REDIS_VERSION.tar.gz && \
-  tar -xf $PHP_REDIS_VERSION.tar.gz && \
-  cd phpredis-$PHP_REDIS_VERSION && \
+  git clone https://github.com/phpredis/phpredis.git && \
+  cd phpredis && \
+  git checkout $PHP_REDIS_VERSION && \
   phpize && \
   ./configure && \
   make && make install && \
@@ -47,14 +46,16 @@ RUN \
   ## Swoole Extension
   git clone https://github.com/swoole/swoole-src.git && \
   cd swoole-src && \
-  git checkout v$PHP_SWOOLE_VERSION && \
+  git checkout $PHP_SWOOLE_VERSION && \
   phpize && \
   ./configure --enable-sockets --enable-http2 && \
   make && make install && \
   cd .. && \
   ## Maxminddb extension
   git clone https://github.com/maxmind/MaxMind-DB-Reader-php.git && \
-  cd MaxMind-DB-Reader-php/ext && \
+  cd MaxMind-DB-Reader-php && \
+  git checkout $PHP_MAXMINDDB_VERSION && \
+  cd ext && \
   phpize && \
   ./configure && \
   make && make install && \

From 884e64673bfa8a7ab9a98b4cd611c0648455da37 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Tue, 27 Oct 2020 08:35:13 +0200
Subject: [PATCH 2/3] Updated CI wait time

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9af6c8fead..897ef61135 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
 install:
 - docker --version
 - docker-compose up -d
-- sleep 15
+- sleep 30
 
 script:
 - docker ps

From 3f3914bf2d0d7f193c0b2a1a740d0ca1ade362dc Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Tue, 27 Oct 2020 10:47:28 +0200
Subject: [PATCH 3/3] Better error log for e2e tests

---
 tests/e2e/Client.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/Client.php b/tests/e2e/Client.php
index e9a47c7350..e2a805a2b5 100644
--- a/tests/e2e/Client.php
+++ b/tests/e2e/Client.php
@@ -236,7 +236,7 @@ class Client
         $responseHeaders['status-code'] = $responseStatus;
 
         if($responseStatus === 500) {
-            echo 'Server error(!): '.json_encode($responseBody)."\n";
+            echo 'Server error('.$method.': '.$path.'. Params: '.json_encode($params).'): '.json_encode($responseBody)."\n";
         }
 
         return [