Merge branch 'arnos-Ubuntu_14.04'

This commit is contained in:
Sameer Naik 2014-05-05 23:12:36 +05:30
commit 57d5f9dfb2

View File

@ -1,17 +1,17 @@
FROM sameersbn/ubuntu:12.04.20140418
FROM sameersbn/ubuntu:latest
MAINTAINER sameer@damagehead.com
RUN apt-get install -y python-software-properties && \
RUN apt-get install -y software-properties-common && \
add-apt-repository -y ppa:git-core/ppa && \
add-apt-repository -y ppa:brightbox/ruby-ng && \
apt-get update && \
apt-get install -y build-essential checkinstall postgresql-client-9.1 \
apt-get install -y build-essential checkinstall postgresql-client \
nginx git-core 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.0 ruby-switch ruby2.0-dev && \
ruby-switch --set ruby2.0 && gem install --no-ri --no-rdoc bundler && \
ruby2.1 ruby2.1-dev && \
gem install --no-ri --no-rdoc bundler && \
apt-get clean # 20140418
ADD assets/setup/ /app/setup/
@ -20,7 +20,7 @@ RUN /app/setup/install
ADD assets/config/ /app/setup/config/
ADD assets/init /app/init
RUN chmod 755 /app/init
RUN chmod 755 /app/init && passwd -d git
ADD authorized_keys /root/.ssh/