Allow docker command to be null, set default CMD in dockerfile instead

Signed-off-by: Fabian von Feilitzsch <[email protected]>
ansible · Dec 6, 2018 · 7f4a0b1 · 7f4a0b1
1 parent 0dd8b7c
commit 7f4a0b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...r/docker/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/Dockerfile.j2 b/...r/docker/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/Dockerfile.j2
@@ -14,3 +14,5 @@ RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y pyth
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
     elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi
 {%- endraw %}
+
+CMD ["sh", "-c", "while true; do sleep 10000; done"]
diff --git a/molecule/model/schema_v2.py b/molecule/model/schema_v2.py
@@ -638,6 +638,7 @@ def pre_validate_base_schema(env, keep_string):
                 },
                 'command': {
                     'type': 'string',
+                    'nullable': True,
                 },
                 'privileged': {
                     'type': 'boolean',

diff --git a/molecule/provisioner/ansible/playbooks/docker/create.yml b/molecule/provisioner/ansible/playbooks/docker/create.yml
@@ -63,7 +63,7 @@
         state: started
         recreate: false
         log_driver: json-file
-        command: "{{ item.command | default('bash -c \"while true; do sleep 10000; done\"') }}"
+        command: "{{ item.command | default(omit) }}"
         privileged: "{{ item.privileged | default(omit) }}"
         security_opts: "{{ item.security_opts | default(omit) }}"
         volumes: "{{ item.volumes | default(omit) }}"