From a89cb8d89cd706ca7551b31c417259d11edd28fd Mon Sep 17 00:00:00 2001
From: Dave Pedu <git@davepedu.com>
Date: Sat, 16 May 2015 13:50:18 -0700
Subject: [PATCH] remove cron and base off dpedu/base

---
 Dockerfile | 8 ++------
 cron.conf  | 4 ----
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 cron.conf

diff --git a/Dockerfile b/Dockerfile
index 14ace77..1423877 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
-FROM ubuntu:14.04
+FROM dpedu/base
 MAINTAINER Dave P
 
-# Admin user
-RUN useradd --create-home --groups sudo admin ; echo "admin:admin" | chpasswd ; locale-gen en
 # ZNC user
 RUN useradd --create-home znc ; echo "znc:znc" | chpasswd 
 
@@ -13,7 +11,7 @@ RUN mkdir /var/run/sshd ; apt-get update ; apt-get install -y supervisor vim ope
 RUN su -c 'cd /home/znc ; apt-get source znc' znc
 
 # Set nginx workers to a low number
-RUN sed -i -e"s/^worker_processes\s*4/worker_processes 1/" /etc/nginx/nginx.conf
+RUN sed -i -e"s/^worker_processes\s*4/worker_processes 2/" /etc/nginx/nginx.conf
 # Set nginx user to ZNC user
 RUN sed -i -e"s/^user\s*www\-data/user znc/" /etc/nginx/nginx.conf
 # Turn off nginx daemon mode
@@ -34,7 +32,6 @@ RUN rm /tmp/crontab
 # Install startup stuff
 COPY supervisor.conf /etc/supervisor/conf.d/supervisor.conf
 COPY nginx.conf /etc/supervisor/conf.d/nginx.conf
-COPY cron.conf /etc/supervisor/conf.d/cron.conf
 COPY znc.conf /etc/supervisor/conf.d/znc.conf
 COPY sshd.conf /etc/supervisor/conf.d/sshd.conf
 COPY start /start
@@ -44,4 +41,3 @@ RUN chmod +x /start
 EXPOSE 22
 # nginx
 EXPOSE 80
-
diff --git a/cron.conf b/cron.conf
deleted file mode 100644
index 3b2d683..0000000
--- a/cron.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[program:cron]
-command=/usr/sbin/cron -f
-autorestart=true
-