External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6617 from chrismeyersfsu/fix-memcached

Browse Source 
fix memcached in dev env

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-04-06 23:49:04 +00:00 committed by GitHub
commit 05b28efd9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker-compose-cluster.yml
View File

@ -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"

2
tools/docker-compose.yml
View File

@ -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:

1
tools/memcached/.dir_placeholder Normal file
View File

@ -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.