From 0fe865064029c43ded3ff6c607bfceeb109894ea Mon Sep 17 00:00:00 2001
From: hack3r-0m <oparikh113@gmail.com>
Date: Sat, 24 Oct 2020 20:45:15 +0000
Subject: [PATCH] Fixed issues with Installing and Enabling C extension

---
 Dockerfile    | 56 ++++++++++++++++++---------------------------------
 composer.json |  1 -
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c0f66d1c5..d605f696b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,23 +30,14 @@ RUN \
   wget \
   git \
   zlib-dev \
-  brotli-dev
+  brotli-dev \
+  libmaxminddb-dev
 
 RUN docker-php-ext-install sockets
 
-# install C extension for .mmdb reader
-# https://github.com/maxmind/libmaxminddb
-RUN wget https://github.com/maxmind/libmaxminddb/releases/download/1.4.3/libmaxminddb-1.4.3.tar.gz
-RUN tar -xvf libmaxminddb-1.4.3.tar.gz && \
-    cd ./libmaxminddb-1.4.3 && \
-    ./configure && \
-    make && \
-    make check && \
-    make install && \
-    ldconfig ./libmaxminddb-1.4.3
-
 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 && \
@@ -54,15 +45,27 @@ RUN \
   ./configure && \
   make && make install && \
   cd .. && \
+
   ## Swoole Extension
+
   git clone https://github.com/swoole/swoole-src.git && \
   cd swoole-src && \
   git checkout v$PHP_SWOOLE_VERSION && \
   phpize && \
   ./configure --enable-sockets --enable-http2 && \
   make && make install && \
+  cd .. && \
+
+  ## php reader extension
+
+  git clone https://github.com/maxmind/MaxMind-DB-Reader-php.git && \
+  cd MaxMind-DB-Reader-php/ext && \
+  phpize && \
+  ./configure && \
+  make && make install && \
   cd ..
 
+
 FROM php:7.4-cli-alpine as final
 
 LABEL maintainer="team@appwrite.io"
@@ -120,6 +123,9 @@ RUN \
   imagemagick-dev \
   certbot \
   docker-cli \
+  libmaxminddb \
+  libmaxminddb-dev \
+
   && pecl install imagick yaml \ 
   && docker-php-ext-enable imagick yaml \
   && docker-php-ext-install sockets opcache pdo_mysql \
@@ -131,6 +137,7 @@ WORKDIR /usr/src/code
 COPY --from=step0 /usr/local/src/vendor /usr/src/code/vendor
 COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
 COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/
+COPY --from=step1 /usr/local/lib/php/extensions/no-debug-non-zts-20190902/maxminddb.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/ 
 
 # Add Source Code
 COPY ./app /usr/src/code/app
@@ -139,30 +146,6 @@ COPY ./docs /usr/src/code/docs
 COPY ./public /usr/src/code/public
 COPY ./src /usr/src/code/src
 
-RUN \
-  apk add --no-cache --virtual .deps \
-  make \
-  automake \
-  autoconf \
-  gcc \
-  g++ \
-  tar \
-  wget \
-  git \
-  zlib-dev \
-  brotli-dev
-
-# Enabling C extension for .mmdb reader and adding loading it
-RUN apk add libmaxminddb-dev && \
-    cd vendor/maxmind-db/reader/ext && ls -a && \
-    phpize && \
-    ./configure && \
-    make && \
-    make test && \
-    make install
-
-RUN echo extension=maxminddb.so >> /usr/local/etc/php/php.ini
-
 # Set Volumes
 RUN mkdir -p /storage/uploads && \
     mkdir -p /storage/cache && \
@@ -200,6 +183,7 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 # Enable Extensions
 RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
 RUN echo extension=redis.so >> /usr/local/etc/php/conf.d/redis.ini
+RUN echo extension=maxminddb.so >> /usr/local/etc/php/conf.d/maxminddb.ini
 
 RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini
 RUN echo "opcache.preload=/usr/src/code/app/preload.php" >> /usr/local/etc/php/conf.d/appwrite.ini
diff --git a/composer.json b/composer.json
index 8b49062d4..7e716d45e 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,6 @@
         "utopia-php/domains": "1.1.*",
 
         "resque/php-resque": "1.3.6",
-        "maxmind-db/reader": "1.8.*",
         "piwik/device-detector": "3.13.0",
         "dragonmantank/cron-expression": "3.0.1",
         "domnikl/statsd": "3.0.*",