Add Tini tooling to ensure graceful shutdown of the Docker container

webdriverio · Feb 1, 2019 · 60ceb83 · 60ceb83
1 parent b4b34bb
commit 60ceb83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -93,6 +93,13 @@ RUN selenium-standalone install
 ADD ./scripts/ /home/seluser/scripts
 
 
+# Add Tini for graceful shutdown
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--"]
+
+
 # Force using non root user to execute the image
 USER seluser
 
@@ -106,4 +113,5 @@ HEALTHCHECK --start-period=5s --interval=3s --retries=8 \
     CMD curl -qsf "$SELENIUM_CONSOLE_URL/status" | jq -r '.value.ready' | grep "true" || exit 1
 
 
-ENTRYPOINT ["sh", "/home/seluser/scripts/start.sh"]
+# Run our start script under Tini
+CMD ["/home/seluser/scripts/start.sh"]
diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 . /home/seluser/scripts/utils.sh && print_selenium_env