From 3e4d5c7fcbedba18fa428e0c1f32312876e093a7 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Thu, 18 Sep 2014 10:47:11 +0530
Subject: [PATCH] switch to sameersbn/debian:jessie.20140918 baseimage

---
 Changelog.md         |  1 +
 Dockerfile           | 13 +++++--------
 assets/setup/install | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 705304c4..503524a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 # Changelog
 
 **latest**
+- rebase image on sameersbn/debian:jessie.20140918 base image
 - added GITLAB_SSH_HOST configuration option
 - added GITLAB_USERNAME_CHANGE configuration option
 
diff --git a/Dockerfile b/Dockerfile
index 29e981b4..619fa23f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,15 @@
-FROM sameersbn/ubuntu:14.04.20140818
+FROM sameersbn/debian:jessie.20140918
 MAINTAINER sameer@damagehead.com
 
-RUN add-apt-repository -y ppa:git-core/ppa \
- && add-apt-repository -y ppa:brightbox/ruby-ng \
- && add-apt-repository -y ppa:nginx/stable \
- && apt-get update \
- && apt-get install -y build-essential cmake postgresql-client \
+RUN apt-get update \
+ && apt-get install -y build-essential pkg-config cmake supervisor logrotate postgresql-client \
       nginx git-core openssh-server mysql-server redis-server python2.7 python-docutils \
       libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
       libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
       libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
-      ruby2.1 ruby2.1-dev \
+      ruby2.1 ruby2.1-dev rubygems \
  && gem install --no-ri --no-rdoc bundler \
- && rm -rf /var/lib/apt/lists/* # 20140818
+ && rm -rf /var/lib/apt/lists/* # 20140918
 
 COPY assets/setup/ /app/setup/
 RUN chmod 755 /app/setup/install
diff --git a/assets/setup/install b/assets/setup/install
index 1d2323a0..c61d62ef 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -99,6 +99,19 @@ sed 's/UsePAM yes/UsePAM no/' -i /etc/ssh/sshd_config
 sed 's/UsePrivilegeSeparation yes/UsePrivilegeSeparation no/' -i /etc/ssh/sshd_config
 echo "UseDNS no" >> /etc/ssh/sshd_config
 
+# configure supervisord log rotation
+cat > /etc/logrotate.d/supervisord <<EOF
+/var/log/supervisor/*.log {
+  weekly
+  missingok
+  rotate 52
+  compress
+  delaycompress
+  notifempty
+  copytruncate
+}
+EOF
+
 # configure supervisor to start sshd
 mkdir -p /var/run/sshd
 cat > /etc/supervisor/conf.d/sshd.conf <<EOF
@@ -152,3 +165,16 @@ autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
 EOF
+
+# configure supervisord to start crond
+cat > /etc/supervisor/conf.d/cron.conf <<EOF
+[program:cron]
+priority=20
+directory=/tmp
+command=/usr/sbin/cron -f
+user=root
+autostart=true
+autorestart=true
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+EOF