Merge pull request #1 from tcpcloud/docker
Support for docker
diff --git a/memcached/files/entrypoint.sh b/memcached/files/entrypoint.sh
new file mode 100644
index 0000000..d696a8b
--- /dev/null
+++ b/memcached/files/entrypoint.sh
@@ -0,0 +1,10 @@
+{%- from "memcached/map.jinja" import server with context -%}
+#!/bin/sh
+
+/usr/bin/memcached -m {{ server.cache_size }} \
+ -l {{ server.bind.address }} -p {{ server.bind.port }} -U {{ server.bind.port }} \
+ -u memcache -c {{ server.incomming_connections }} -t {{ server.threads }}
+
+{#-
+vim: syntax=jinja
+-#}
diff --git a/memcached/server.sls b/memcached/server.sls
index 87f88e3..5f37d51 100644
--- a/memcached/server.sls
+++ b/memcached/server.sls
@@ -15,6 +15,17 @@
- require:
- pkg: memcached_packages
+{%- if grains.get('virtual_subtype', None) == "Docker" %}
+
+memcached_service:
+ file.managed:
+ - name: /entrypoint.sh
+ - template: jinja
+ - source: salt://memcached/files/entrypoint.sh
+ - mode: 755
+
+{%- else %}
+
memcached_service:
service.running:
- enable: True
@@ -23,3 +34,5 @@
- file: memcached_config
{%- endif %}
+
+{%- endif %}