From c4d704bee1c96073b6e14bb89d9db9e4e413016b Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Mon, 6 Apr 2020 16:12:05 -0400
Subject: [PATCH] fix memcached in dev env

* create memcached dir via git so that the current user owns it.
Otherwise, docker will create the dir as root at runtime
---
 tools/docker-compose-cluster.yml | 2 +-
 tools/docker-compose.yml         | 2 +-
 tools/memcached/.dir_placeholder | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 tools/memcached/.dir_placeholder

diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml
index c26382fdad..d9a9b3c1d9 100644
--- a/tools/docker-compose-cluster.yml
+++ b/tools/docker-compose-cluster.yml
@@ -109,6 +109,6 @@ services:
     user: ${CURRENT_UID}
     image: memcached:alpine
     container_name: tools_memcached_1
-    command: ["-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
+    command: ["memcached", "-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
     volumes:
       - "./memcached/:/var/run/memcached"
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index 61a2d9b9ef..f81307a858 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -54,7 +54,7 @@ services:
     user: ${CURRENT_UID}
     image: memcached:alpine
     container_name: tools_memcached_1
-    command: ["-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
+    command: ["memcached", "-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
     volumes:
       - "./memcached/:/var/run/memcached"
   redis:
diff --git a/tools/memcached/.dir_placeholder b/tools/memcached/.dir_placeholder
new file mode 100644
index 0000000000..12ff59c525
--- /dev/null
+++ b/tools/memcached/.dir_placeholder
@@ -0,0 +1 @@
+This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the memcached container will be unable to create a socket file in a directory owned by root.