diff options
| author | Olaf Flebbe <of@ofleb.be> | 2016-01-09 14:43:00 +0100 |
|---|---|---|
| committer | Olaf Flebbe <of@ofleb.be> | 2016-01-16 18:36:08 +0100 |
| commit | fd1c776957a077c9353c820fe5adbe5fc3babe25 (patch) | |
| tree | 29bcd85ddd63535c869d5761e464c84a0954fab2 | |
| parent | 75bb6142752c26800aa7ab0bbfc1ca66fad8424d (diff) | |
BIGTOP-2228: Add tini as init process to bigtop/deploy images
| -rw-r--r-- | docker/bigtop-deploy/centos-6/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/bigtop-deploy/debian-8/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/bigtop-deploy/ubuntu-14.04/Dockerfile | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/docker/bigtop-deploy/centos-6/Dockerfile b/docker/bigtop-deploy/centos-6/Dockerfile index 823dfc32..fd9b56d8 100644 --- a/docker/bigtop-deploy/centos-6/Dockerfile +++ b/docker/bigtop-deploy/centos-6/Dockerfile @@ -31,4 +31,10 @@ RUN yum -y install openssh-server openssh-clients vim && \ # Install required Puppet modules puppet apply -e "include bigtop_toolchain::puppet-modules" +#Add Tini +ENV TINI_VERSION v0.8.4 +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +RUN chmod +x /tini +ENTRYPOINT ["/tini", "--"] + CMD /usr/sbin/sshd -D diff --git a/docker/bigtop-deploy/debian-8/Dockerfile b/docker/bigtop-deploy/debian-8/Dockerfile index bd0e8d3c..08d4c82b 100644 --- a/docker/bigtop-deploy/debian-8/Dockerfile +++ b/docker/bigtop-deploy/debian-8/Dockerfile @@ -31,4 +31,10 @@ RUN apt-get update && \ # Install required Puppet modules puppet apply -e "include bigtop_toolchain::puppet-modules" +#Add Tini +ENV TINI_VERSION v0.8.4 +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +RUN chmod +x /tini +ENTRYPOINT ["/tini", "--"] + CMD /usr/sbin/sshd -D diff --git a/docker/bigtop-deploy/ubuntu-14.04/Dockerfile b/docker/bigtop-deploy/ubuntu-14.04/Dockerfile index 24170d33..356c1486 100644 --- a/docker/bigtop-deploy/ubuntu-14.04/Dockerfile +++ b/docker/bigtop-deploy/ubuntu-14.04/Dockerfile @@ -31,4 +31,10 @@ RUN apt-get update && \ # Install required Puppet modules puppet apply -e "include bigtop_toolchain::puppet-modules" +#Add Tini +ENV TINI_VERSION v0.8.4 +ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +RUN chmod +x /tini +ENTRYPOINT ["/tini", "--"] + CMD /usr/sbin/sshd -D |