redis socket support

installer/roles/local_docker/defaults/main.yml

@@ -2,8 +2,6 @@
 dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
 
 redis_image: "redis"
-redis_hostname: "redis"
-redis_port: "6379"
 
 postgresql_version: "10"
 postgresql_image: "postgres:{{postgresql_version}}"

installer/roles/local_docker/tasks/compose.yml

@@ -4,6 +4,12 @@
     path: "{{ docker_compose_dir }}"
     state: directory
 
+- name: Create Redis socket directory
+  file:
+    path: "{{ docker_compose_dir }}/redis_socket"
+    state: directory
+    mode: 0777
+
 - name: Create Docker Compose Configuration
   template:
     src: "{{ item }}.j2"
@@ -14,8 +20,14 @@
     - credentials.py
     - docker-compose.yml
     - nginx.conf
+    - redis.conf
   register: awx_compose_config
 
+- name: Set redis config to other group readable to satisfy redis-server
+  file:
+    path: "{{ docker_compose_dir }}/redis.conf"
+    mode: 0666
+
 - name: Render SECRET_KEY file
   copy:
     content: "{{ secret_key }}"

installer/roles/local_docker/templates/credentials.py.j2

@@ -10,18 +10,6 @@ DATABASES = {
     }
 }
 
-BROKER_URL = 'redis://{}:{}/'.format(
-    "{{ redis_hostname }}",
-    "{{ redis_port }}",)
-
-CHANNEL_LAYERS = {
-    'default': {'BACKEND': 'channels_redis.core.RedisChannelLayer',
-                'CONFIG': {
-                    'hosts': [("{{ redis_hostname }}", {{ redis_port|int }})],
-                    'capacity': 10000,
-                 }}
-}
-
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',

installer/roles/local_docker/templates/docker-compose.yml.j2

@@ -24,6 +24,7 @@ services:
       - "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
       - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
       - "{{ docker_compose_dir }}/nginx.conf:/etc/nginx/nginx.conf:ro"
+      - "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
     {% if project_data_dir is defined %}
       - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
     {% endif %}
@@ -76,6 +77,7 @@ services:
       - "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY"
       - "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
       - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
+      - "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
     {% if project_data_dir is defined %}
       - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
     {% endif %}
@@ -119,6 +121,10 @@ services:
       http_proxy: {{ http_proxy | default('') }}
       https_proxy: {{ https_proxy | default('') }}
       no_proxy: {{ no_proxy | default('') }}
+    command: ["/usr/local/etc/redis/redis.conf"]
+    volumes:
+      - "{{ docker_compose_dir }}/redis.conf:/usr/local/etc/redis/redis.conf:ro"
+      - "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
 
   memcached:
     image: "{{ memcached_image }}:{{ memcached_version }}"

installer/roles/local_docker/templates/environment.sh.j2

@@ -8,7 +8,5 @@ DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
 {% endif %}
 MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
 MEMCACHED_PORT={{ memcached_port|default('11211')|quote }}
-REDIS_HOST={{ redis_hostname|quote }}
-REDIS_PORT={{ redis_port|quote }}
 AWX_ADMIN_USER={{ admin_user|quote }}
 AWX_ADMIN_PASSWORD={{ admin_password|quote }}

installer/roles/local_docker/templates/redis.conf.j2

@@ -0,0 +1,4 @@
+unixsocket /var/run/redis/redis.sock
+unixsocketperm 777
+port 0
+bind 127.0.0.1