use sameersbn/ubuntu:12.04.20140418 as the base image

This commit is contained in:
Sameer Naik
2014-04-19 20:40:29 +05:30
parent 34c1063b9b
commit f911ebb8f1
5 changed files with 8 additions and 42 deletions
+6 -23
View File
@@ -1,33 +1,16 @@
FROM ubuntu:12.04
FROM sameersbn/ubuntu:12.04.20140418
MAINTAINER sameer@damagehead.com
ENV DEBIAN_FRONTEND noninteractive
RUN sed 's/main$/main universe/' -i /etc/apt/sources.list
RUN apt-get update # 20140409
# Fix some issues with APT packages.
# See https://github.com/dotcloud/docker/issues/1024
RUN dpkg-divert --local --rename --add /sbin/initctl && \
ln -sf /bin/true /sbin/initctl
# essentials
RUN apt-get install -y vim curl wget sudo net-tools pwgen unzip \
logrotate supervisor openssh-server && apt-get clean
# build tools
# RUN apt-get install -y gcc make && apt-get clean
# image specific
RUN apt-get install -y postgresql-9.1 postgresql-client-9.1 && apt-get clean
RUN apt-get update && \
apt-get install -y postgresql-9.1 postgresql-client-9.1 && \
apt-get clean # 20140418
ADD assets/ /app/
RUN mv /app/.vimrc /app/.bash_aliases /root/
RUN chmod 755 /app/init /app/setup/install && /app/setup/install
RUN chmod 755 /app/init /app/setup/install
RUN /app/setup/install
ADD authorized_keys /root/.ssh/
RUN chmod 700 /root/.ssh && chmod 600 /root/.ssh/authorized_keys && chown root:root -R /root/.ssh
EXPOSE 22
EXPOSE 5432
VOLUME ["/var/lib/postgresql"]
-5
View File
@@ -1,5 +0,0 @@
PS1='${debian_chroot:+($debian_chroot)}[\u@\h \W]# '
alias rm='rm -i'
alias cp='cp -i'
-2
View File
@@ -1,2 +0,0 @@
se ai
se sw=2 ts=2
+1
View File
@@ -9,6 +9,7 @@ echo User: root Password: $ROOT_PASSWORD
# start supervisord
/usr/bin/supervisord
supervisorctl start sshd
appStart () {
# fix permissions and ownership of /var/lib/postgresql
+1 -12
View File
@@ -1,16 +1,5 @@
#!/bin/bash
mkdir -p /var/run/sshd
cat > /etc/supervisor/conf.d/sshd.conf <<EOF
[program:sshd]
directory=/
command=/usr/sbin/sshd -D
user=root
autostart=true
autorestart=true
stdout_logfile=/var/log/supervisor/%(program_name)s.log
stderr_logfile=/var/log/supervisor/%(program_name)s_error.log
EOF
set -e
# listen on all interfaces
cat >> /etc/postgresql/9.1/main/postgresql.conf <<EOF