Refactored docker-compose roles

roles/docker-snipe-it/templates/docker-compose.yml.j2

@@ -1,28 +1,18 @@
-services:
-
-{% include 'templates/docker/services/redis.yml.j2' %}
-
-{% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
-
-{% include 'roles/docker-oauth2-proxy/templates/container.yml.j2' %}
+{% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
+{% set container_port = 80 %}
     image: grokability/snipe-it:{{applications[application_id].version}}
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
     volumes:
       - data:/var/lib/snipeit
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
-{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
+      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
-    healthcheck:
-      test: ["CMD", "bash", "-c", "exec 3<>/dev/tcp/localhost/80 && echo -e 'GET / HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n' >&3 && cat <&3 | grep -q 'HTTP/1.1'"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      
+{% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
 {% include 'templates/docker/compose/volumes.yml.j2' %}
   redis:
   data:
 
-{% include 'templates/docker/compose/networks.yml.j2' %}
+{% include 'templates/docker/compose/networks.yml.j2' %}

roles/docker-snipe-it/vars/configuration.yml

@@ -26,4 +26,10 @@ oauth2_proxy:
   port:         "80"
   acl:
     blacklist:
-      - "/login"
+      - "/login"
+docker:
+  services:
+    redis:
+      enabled: true
+    database: 
+      enabled: true