From 3e72b6a35f2aff6a299019c34f4b57e97ba480aa Mon Sep 17 00:00:00 2001 From: Mike Bryant Date: Tue, 19 Jan 2016 14:04:29 +0000 Subject: Switch to phusion's docker-baseimage, to get service management and process reaping --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b2aecfb..01a0c5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,14 @@ -FROM debian:latest +FROM phusion/baseimage:0.9.18 MAINTAINER Samer Abdel-Hafez -RUN apt-get update && \ - apt-get install -y ruby ruby-dev libsqlite3-dev libssl-dev pkg-config make cmake +RUN add-apt-repository ppa:brightbox/ruby-ng && \ + apt-get update && \ + apt-get install -y ruby2.1 ruby2.1-dev libsqlite3-dev libssl-dev pkg-config make cmake RUN gem install oxidized oxidized-web --no-ri --no-rdoc RUN apt-get remove -y ruby-dev pkg-config make cmake -RUN apt-get -y autoremove \ No newline at end of file +RUN apt-get -y autoremove + +ADD extra/oxidized.runit /etc/service/oxidized/run -- cgit v1.2.1 From eb3d86fe6debc286d74e0eed5a61d5a564b324c4 Mon Sep 17 00:00:00 2001 From: Mike Bryant Date: Tue, 19 Jan 2016 14:07:54 +0000 Subject: Add the option of automatically reloading the config every X seconds. Fixes #271 --- Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 01a0c5f..0eeeb8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,3 +12,4 @@ RUN apt-get remove -y ruby-dev pkg-config make cmake RUN apt-get -y autoremove ADD extra/oxidized.runit /etc/service/oxidized/run +ADD extra/auto-reload-config.runit /etc/service/auto-reload-config/run -- cgit v1.2.1