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 +++++++---- extra/oxidized.runit | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100755 extra/oxidized.runit 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 diff --git a/extra/oxidized.runit b/extra/oxidized.runit new file mode 100755 index 0000000..c4ce129 --- /dev/null +++ b/extra/oxidized.runit @@ -0,0 +1,2 @@ +#!/bin/bash +exec setuser root oxidized -- cgit v1.2.1