From ef22986aa0ce0638ab4210036895d9fd7ad2723a Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 3 Jun 2019 16:03:51 -0400 Subject: [PATCH] Install latest tini from RPM --- tools/docker-compose/Dockerfile | 3 +-- tools/docker-compose/start_development.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 8abbd26cfe..738daa305d 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -73,8 +73,7 @@ RUN yum -y install acl \ xorg-x11-utils \ yum-utils -ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini -RUN chmod +x /tini +RUN yum install -y https://github.com/krallin/tini/releases/download/v0.18.0/tini_0.18.0.rpm RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN mkdir -p /data/db diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index 3fd18f8aca..9454253e33 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/start_development.sh @@ -5,4 +5,4 @@ set +x cd /awx_devel # Start the services -exec /tini -- make supervisor +exec tini -- make supervisor