Add container timeout to prevent dangling containers

Author: Szpadel

Dockerfile

@@ -113,8 +113,10 @@ WORKDIR /var/www/html
 
 EXPOSE 22 80 3306 9200
 
+ENV CONTAINER_TIMEOUT=1h
+
 ENTRYPOINT ["/sbin/multirun"]
 
-CMD ["/usr/sbin/start-elasticsearch", "/usr/sbin/start-mysql"]
+CMD ["/usr/sbin/start-elasticsearch", "/usr/sbin/start-mysql", "/usr/bin/container-timeout"]
 
 HEALTHCHECK --timeout=10s --interval=10s --start-period=10s CMD /usr/bin/healthcheck

README.md

@@ -7,6 +7,11 @@
 
 Please see the docker hub repo page [mageops/magento-run-tests](https://hub.docker.com/r/mageops/magento-run-tests).
 
+# Container timeout
+Container will by default exit after 1h to prevent dangling container in CI environments,
+you can adjust this behavior by changing setting different `CONTAINER_TIMEOUT` environment variable.
+Setting `CONTAINER_TIMEOUT` to `no` will disable that behavior completely.
+
 ## Docker tags and software versions
 
 The `master` branch uses Maria DB 10.2, Elasticsearch 6 and PHP 7.2 which are the latest versions supported by Magento.

docker-compose.yml

@@ -1,15 +1,13 @@
 version: "2.3"
 services:
   tests:
-    image: magesuite/run-tests:stable
+    build: .
     environment:
       - DB_USER=magento2
       - DB_PASS=magento2
       - DB_NAME=magento2_integration_tests
+      - CONTAINER_TIMEOUT=30s
     volumes:
-      - type: bind
-        source: '${PWD}'
-        target: /var/www/html
       - type: tmpfs
         target: /tmp:rw,exec
         volume:
@@ -34,5 +32,3 @@ services:
         target: /dev/tests/integration/tmp
         volume:
           nocopy: true
-
-

rootfs/usr/bin/container-timeout

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -auo pipefail
+
+if [ "${CONTAINER_TIMEOUT:-}" == "no" ];then
+    echo "Container timeout disabled"
+    while true;do
+        sleep 1h
+    done
+fi
+
+sleep "${CONTAINER_TIMEOUT:-1h}"
+echo "Container timeout reached, exiting"
+exit 1