Add own service for memcached

Goal: one service per container

- add own service for memcached

- remove memcached from geonode image

- add MEMCACHED_OPTIONS variable to env files

- enable memcached by default

.env

@@ -166,11 +166,15 @@ GEOIP_PATH=/mnt/volumes/statics/geoip.db
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
-MEMCACHED_ENABLED=False
+MEMCACHED_ENABLED=True
 MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
-MEMCACHED_LOCATION=127.0.0.1:11211
+MEMCACHED_LOCATION=memcached:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10
+#
+# Options for memcached binary, e.g. -vvv to log all requests and cache hits
+#
+MEMCACHED_OPTIONS=
 
 MAX_DOCUMENT_SIZE=2
 CLIENT_RESULTS_LIMIT=5
@@ -213,9 +217,9 @@ LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
 
 # expressed in KB
 # CELERY__MAX_MEMORY_PER_CHILD="200000"
-# ## 
+# ##
 # Note right autoscale value must coincide with worker concurrency value
-# CELERY__AUTOSCALE_VALUES="1,4" 
+# CELERY__AUTOSCALE_VALUES="1,4"
 # CELERY__WORKER_CONCURRENCY="4"
 # ##
 # CELERY__OPTS="--without-gossip --without-mingle -Ofair -B -E"

.env_dev

@@ -160,11 +160,15 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
-MEMCACHED_ENABLED=False
+MEMCACHED_ENABLED=True
 MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
-MEMCACHED_LOCATION=127.0.0.1:11211
+MEMCACHED_LOCATION=memcached:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10
+#
+# Options for memcached binary, e.g. -vvv to log all requests and cache hits
+#
+MEMCACHED_OPTIONS=
 
 MAX_DOCUMENT_SIZE=2
 CLIENT_RESULTS_LIMIT=5

.env_local

@@ -160,11 +160,15 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
-MEMCACHED_ENABLED=False
+MEMCACHED_ENABLED=True
 MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
-MEMCACHED_LOCATION=127.0.0.1:11211
+MEMCACHED_LOCATION=memcached:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10
+#
+# Options for memcached binary, e.g. -vvv to log all requests and cache hits
+#
+MEMCACHED_OPTIONS=
 
 MAX_DOCUMENT_SIZE=2
 CLIENT_RESULTS_LIMIT=5

.env_test

@@ -160,11 +160,15 @@ GEOIP_PATH=/mnt/volumes/statics/geoip.db
 
 CACHE_BUSTING_STATIC_ENABLED=False
 
-MEMCACHED_ENABLED=False
+MEMCACHED_ENABLED=True
 MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
-MEMCACHED_LOCATION=127.0.0.1:11211
+MEMCACHED_LOCATION=memcached:11211
 MEMCACHED_LOCK_EXPIRE=3600
 MEMCACHED_LOCK_TIMEOUT=10
+#
+# Options for memcached binary, e.g. -vvv to log all requests and cache hits
+#
+MEMCACHED_OPTIONS=
 
 MAX_DOCUMENT_SIZE=2
 CLIENT_RESULTS_LIMIT=5

Dockerfile

@@ -38,8 +38,6 @@ RUN pip install pip --upgrade \
     && pip install pygdal==$(gdal-config --version).* \
         flower==0.9.4
 
-# Activate "memcached"
-RUN apt install -y memcached
 RUN pip install pylibmc \
     && pip install sherlock
 

docker-compose-test.yml

@@ -69,6 +69,19 @@ services:
       - statics:/mnt/volumes/statics
     restart: on-failure
 
+  # memcached service
+  memcached:
+    image: memcached:alpine
+    container_name: memcached4${COMPOSE_PROJECT_NAME}
+    command: memcached ${MEMCACHED_OPTIONS}
+    restart: on-failure
+    healthcheck:
+      test: nc -z 127.0.0.1 11211
+      interval: 30s
+      timeout: 30s
+      retries: 5
+      start_period: 30s
+
   # Gets and installs letsencrypt certificates
   letsencrypt:
     image: geonode/spcgeonode:letsencrypt-3.1

docker-compose.yml

@@ -47,6 +47,19 @@ services:
     entrypoint: ["/usr/src/geonode/entrypoint.sh"]
     command: "celery-cmd"
 
+  # memcached service
+  memcached:
+    image: memcached:alpine
+    container_name: memcached4${COMPOSE_PROJECT_NAME}
+    command: memcached ${MEMCACHED_OPTIONS}
+    restart: on-failure
+    healthcheck:
+      test: nc -z 127.0.0.1 11211
+      interval: 30s
+      timeout: 30s
+      retries: 5
+      start_period: 30s
+
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
     image: geonode/nginx:3.x

entrypoint.sh

@@ -16,7 +16,6 @@ invoke () {
 
 # Start cron && memcached services
 service cron restart
-service memcached restart
 
 echo $"\n\n\n"
 echo "-----------------------------------------------------"