FIX trajano#29: use Tini (offiically supported by Docker) to reap def…

…unct glusterfs processes.
ximon18 · Mar 7, 2020 · 6d931e3 · 6d931e3
1 parent 6febaa3
commit 6d931e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/glusterfs-volume-plugin/Dockerfile b/glusterfs-volume-plugin/Dockerfile
@@ -1,4 +1,7 @@
 FROM oraclelinux:7-slim
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
 RUN yum install -q -y oracle-gluster-release-el7 && \
     yum install -q -y git glusterfs glusterfs-fuse attr && \
     curl --silent -L https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz | tar -C /usr/local -zxf -

diff --git a/glusterfs-volume-plugin/config.json b/glusterfs-volume-plugin/config.json
@@ -2,6 +2,8 @@
     "description": "GlusterFS plugin for Docker",
     "documentation": "https://github.com/trajano/docker-volume-plugins/",
     "entrypoint": [
+        "/tini",
+        "--",
         "/glusterfs-volume-plugin"
     ],
     "env": [
@@ -33,4 +35,4 @@
             }
         ]
     }
-}
+}