Adds tini to images

roles/docker_image_build/defaults/main.yml

@@ -6,6 +6,8 @@ ubuntu_tag: latest
 
 timezone: UTC
 
+tini_version: v0.19.0
+
 splunk_home: /opt/splunk
 splunk_user: splunk
 splunk_user_id: 8089

roles/docker_image_build/templates/build/Dockerfile

@@ -13,6 +13,11 @@ RUN ln -fs /usr/share/zoneinfo/{{ timezone }} /etc/localtime \
   && apt-get install -y --no-install-recommends wget ca-certificates {{ apt_packages|join(' ') }} \
   && apt-get clean
 
+# Add tini as an init to fix signal forwarding when using a bash script as the entrypoint
+ENV TINI_VERSION {{ tini_version }}
+ADD https://github.com/krallin/tini/releases/download/${{ tini_version }}/tini /tini
+RUN chmod +x /tini
+
 {% if install_splunk %}
 # change user prior to untarring splunk
 USER {{ splunk_user_id }}:{{ splunk_group_id }}
@@ -40,7 +45,7 @@ COPY {% if 'owner' in copy_path_config %}--chown={{ copy_path_config.owner }}{%
 {% endfor %}
 
 {% if run_commands %}
-# configurable RUN commands are called after file copies so they can use the copied fils
+# configurable RUN commands are called after file copies so they can use the copied files
 {% for run_command in run_commands %}
 {% if 'user' in run_command %}
 USER {{ run_command.user }}{% if 'group' in run_command  %}:{{ run_command.group }}{% endif %}
@@ -66,7 +71,7 @@ RUN {{ splunk_home }}/bin/splunk btool check
 {% endif %}
 
 # entrypoint.sh may do run-time configurations prior to starting splunk
-ENTRYPOINT {{ entrypoint }}
+ENTRYPOINT [ "/tini", "-g", "--", {{ entrypoint | tojson | join(', ') }} ]
 
 {% if healthcheck_command %}
 HEALTHCHECK \

roles/docker_service_deploy/defaults/main.yml

@@ -11,3 +11,7 @@ splunk_user: splunk
 splunk_user_id: 8089
 splunk_group: splunk
 splunk_group_id: 8089
+
+# https://docs.docker.com/reference/cli/docker/service/create/
+# Note: Docker Swarm defaults to 10s
+stop_grace_period: 10s

roles/docker_service_deploy/tasks/create_service.yml

@@ -20,6 +20,7 @@
       driver: "{{ log_driver | default(omit) }}"
       options: "{{ log_driver_options | default(omit) }}"
     env: "{{ env | default(omit) }}"
+    stop_grace_period: "{{ stop_grace_period | default(omit) }}"
   become: "{{ docker_become_user is defined }}"
   become_user: "{{ docker_become_user|default(omit) }}"
   # tagged to allow skipping to allow only management of volumes