From c0943b24a1deb33ef2d866e722f77bc4e564ead5 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 23 Oct 2014 16:35:05 -0400 Subject: [PATCH] 3824: Add dnsmasq to compute images, to make docker-in-docker work. refs #3333 --- docker/compute/Dockerfile | 2 +- docker/compute/supervisor.conf | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile index 2f6979c093..792fd28214 100644 --- a/docker/compute/Dockerfile +++ b/docker/compute/Dockerfile @@ -3,7 +3,7 @@ FROM arvados/slurm MAINTAINER Ward Vandewege -RUN apt-get update && apt-get -qqy install supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron +RUN apt-get update && apt-get -qqy install supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq ADD fuse.conf /etc/fuse.conf diff --git a/docker/compute/supervisor.conf b/docker/compute/supervisor.conf index f2cce3fe51..7fc34fc2c9 100644 --- a/docker/compute/supervisor.conf +++ b/docker/compute/supervisor.conf @@ -27,3 +27,8 @@ startsecs=0 user=root command=/usr/local/bin/wrapdocker.sh +[program:dnsmasq] +user=root +command=/etc/init.d/dnsmasq start +startsecs=0 + -- 2.30.2