Merge branch 'master' of http://github.com/funkwerk/compose_format

funkwerk · Oct 6, 2017 · 4211202 · 4211202
2 parents fb655e4 + c464c44
commit 4211202
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/compose_format/__init__.py b/compose_format/__init__.py
@@ -17,7 +17,7 @@ class ComposeFormat:
         'healthcheck',
         'env_file', 'environment',
         'cpu_shares', 'cpu_quota', 'cpuset', 'domainname', 'hostname', 'ipc',
-        'mac_address', 'mem_limit', 'memswap_limit', 'privileged',
+        'mac_address', 'mem_limit', 'memswap_limit', 'privileged', 'shm_size',
         'depends_on', 'extends', 'external_links',
         'stdin_open', 'user', 'working_dir',
         'extra_hosts', 'restart', 'ulimits', 'tty', 'dns', 'dns_search', 'pid',