Merge branch 'master' of git@gitlab.2iopenservice.com:vincent/docker.git

.gitignore

@@ -16,4 +16,5 @@
 !/.ssh/id_rsa_exploitation
 /docker/.idea
 /docker/nginx/certs/*
-!/docker/nginx/certs/ssl_keys.sh
+!/docker/nginx/certs/ssl_keys.sh
+.DS_Store

docker-compose.yaml

@@ -307,6 +307,12 @@ services:
     depends_on:
       - db
 
+  memcached:
+    hostname: memcached
+    container_name: memcached
+    image: memcached
+    restart: always
+
   mailcatcher:
     hostname: mailcatcher
     container_name: mailcatcher

docker/php/Dockerfile

@@ -53,6 +53,16 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 ########   BLACKFIRE #########
 
+RUN set -ex \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y libmemcached-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && MEMCACHED="`mktemp -d`" \
+    && curl -skL https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz | tar zxf - --strip-components 1 -C $MEMCACHED \
+    && docker-php-ext-configure $MEMCACHED \
+    && docker-php-ext-install $MEMCACHED \
+    && rm -rf $MEMCACHED
+
 ######## XDebug ########
 #RUN pecl install xdebug-2.7.2; \
 #    docker-php-ext-enable xdebug;