From 11b237fc55ccecf62d5435eab5682fb7aeb91230 Mon Sep 17 00:00:00 2001
From: Cola <cscolabear@gmail.com>
Date: Thu, 25 Jul 2019 11:56:43 +0800
Subject: [PATCH 1/5] add memcached

set use 128mb
---
 docker-compose.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 87529dd..fe1504f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,6 +39,17 @@ services:
       app_net:
         ipv4_address: 172.16.1.50
 
+  memcached:
+    hostname: docker-memcached
+    image: memcached:latest
+    ports:
+      - 11211:11211
+    command:
+      - '-m 128'
+    restart: on-failure
+    networks:
+      - app_net
+
   workspace:
     hostname: docker-workspace
     build:

From d8687a1aef425016ceae1e231743359aa4dc7c8b Mon Sep 17 00:00:00 2001
From: Cola <cscolabear@gmail.com>
Date: Tue, 30 Jul 2019 12:22:41 +0800
Subject: [PATCH 2/5] add memcache

---
 Dockerfiles/php-fpm/Dockerfile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Dockerfiles/php-fpm/Dockerfile b/Dockerfiles/php-fpm/Dockerfile
index 87e914d..696a2e8 100644
--- a/Dockerfiles/php-fpm/Dockerfile
+++ b/Dockerfiles/php-fpm/Dockerfile
@@ -38,6 +38,24 @@ RUN set -xe; \
     docker-php-ext-enable xdebug
 
 
+
+
+# Install needed php extensions: memcache
+RUN curl -fsSL 'https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCKING_IO_php7.zip' -o memcache.zip \
+    && unzip memcache.zip \
+    && rm memcache.zip \
+    && ( \
+    cd pecl-memcache-NON_BLOCKING_IO_php7 \
+    && phpize \
+    && ./configure --enable-memcache \
+    && make \
+    && make install \
+    ) \
+    && rm -r pecl-memcache-NON_BLOCKING_IO_php7 \
+    && docker-php-ext-enable memcache
+
+
+
 # install zip extensions
 # ps. next lines are here becase there is no auto build on docker
 RUN apt-get install -y --no-install-recommends \

From b30e4cdf4251afd3d38d88b60f0e405d765ad8c5 Mon Sep 17 00:00:00 2001
From: Cola <cscolabear@gmail.com>
Date: Thu, 27 Feb 2020 12:17:52 +0800
Subject: [PATCH 3/5] remove reservations

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a25ec08..540b12a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,6 @@ services:
           cpus: '0.50'
           memory: 512M
         reservations:
-          cpus: '0.25'
           memory: 128M
       restart_policy:
         condition: on-failure
@@ -49,7 +48,6 @@ services:
           cpus: '0.10'
           memory: 30M
         reservations:
-          cpus: '0.05'
           memory: 10M
       restart_policy:
         condition: on-failure

From 73940ba749c238001c12eb8ef260cee5e75c318b Mon Sep 17 00:00:00 2001
From: Cola <cscolabear@gmail.com>
Date: Thu, 7 May 2020 12:34:29 +0800
Subject: [PATCH 4/5] add env add user, password

---
 docker-compose.yml | 3 +++
 env-example        | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 71ad67c..868025b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,6 +60,9 @@ services:
     image: memcached:latest
     ports:
       - 11211:11211
+    environment:
+      - MEMCACHED_USERNAME=${MEMCACHED_USERNAME}
+      - MEMCACHED_PASSWORD=${MEMCACHED_PASSWORD}
     command:
       - '-m 128'
     deploy:
diff --git a/env-example b/env-example
index b8d126c..f187dbf 100644
--- a/env-example
+++ b/env-example
@@ -4,3 +4,9 @@
 
 # e.g. /Users/USER_NAME/Projects
 VOLUMES_DRIVER=
+
+
+
+# memcached
+MEMCACHED_USERNAME=
+MEMCACHED_PASSWORD=

From c02d11755185611bf7dc60690f32cadf2390f44a Mon Sep 17 00:00:00 2001
From: Cola <cscolabear@gmail.com>
Date: Wed, 13 May 2020 12:19:42 +0800
Subject: [PATCH 5/5] assign version

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 868025b..bb2b5f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,7 +57,7 @@ services:
 
   MEMCACHED:
     hostname: docker-memcached
-    image: memcached:latest
+    image: memcached:1.5
     ports:
       - 11211:11211
     environment: