Merge pull request trinodb#14 from chancez/add_tini

Dockerfile*: Add tini to Dockerfiles

Dockerfile

@@ -96,6 +96,10 @@ RUN yum -y install --setopt=skip_missing_names_on_install=False \
     && yum clean all \
     && rm -rf /var/cache/yum
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
+
 RUN mkdir -p /opt/presto
 
 ENV PRESTO_VERSION 315
@@ -132,7 +136,7 @@ USER 1003
 EXPOSE 8080
 WORKDIR $PRESTO_HOME
 
-CMD ["bin/launcher", "run"]
+CMD ["tini", "--", "bin/launcher", "run"]
 
 LABEL io.k8s.display-name="OpenShift Presto" \
       io.k8s.description="This is an image used by operator-metering to to install and run Presto." \

Dockerfile.okd

@@ -96,6 +96,10 @@ RUN yum -y install --setopt=skip_missing_names_on_install=False \
     && yum clean all \
     && rm -rf /var/cache/yum
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
+
 RUN mkdir -p /opt/presto
 
 ENV PRESTO_VERSION 315
@@ -132,7 +136,7 @@ USER 1003
 EXPOSE 8080
 WORKDIR $PRESTO_HOME
 
-CMD ["bin/launcher", "run"]
+CMD ["tini", "--", "bin/launcher", "run"]
 
 LABEL io.k8s.display-name="OpenShift Presto" \
       io.k8s.description="This is an image used by operator-metering to to install and run Presto." \

Dockerfile.rhel

@@ -41,6 +41,7 @@ RUN yum -y install --setopt=skip_missing_names_on_install=False \
         java-1.8.0-openjdk-devel \
         less \
         rsync \
+        tini \
         faq \
     && yum clean all \
     && rm -rf /var/cache/yum
@@ -81,7 +82,7 @@ USER 1003
 EXPOSE 8080
 WORKDIR $PRESTO_HOME
 
-CMD ["bin/launcher", "run"]
+CMD ["tini", "--", "bin/launcher", "run"]
 
 LABEL io.k8s.display-name="OpenShift Presto" \
       io.k8s.description="This is an image used by operator-metering to to install and run Presto." \