From 78a296f4947c0a96dca42bfb8ee324d89d05e095 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 15:59:31 -0400 Subject: [PATCH 1/6] Changed image to use the lastest build (based of Ubuntu:14.04LTS) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e51c776..15818743 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sameersbn/ubuntu:12.04.20140418 +FROM sameersbn/ubuntu:latest MAINTAINER sameer@damagehead.com RUN apt-get install -y python-software-properties && \ From c2d4fae51b88bc6d38f2e9dfda03c25e86be4650 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 16:01:26 -0400 Subject: [PATCH 2/6] add-apt-repository is now in the software-properties-common package --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15818743..1cbac522 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ 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 && \ From d5df9a8755c2a9ecddb5efb4fe36671b0cc61ad2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 16:02:08 -0400 Subject: [PATCH 3/6] The postgresql-client default is now 9.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1cbac522..6beffadb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ 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 \ From 63b983719f2d43c55fc1b51007b9648444d48edd Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 16:03:58 -0400 Subject: [PATCH 4/6] update ruby to install 2.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6beffadb..b31d7364 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get install -y software-properties-common && \ 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 && \ + ruby2.1 ruby2.1-dev && \ ruby-switch --set ruby2.0 && gem install --no-ri --no-rdoc bundler && \ apt-get clean # 20140418 From e2eb91c170b2452cc3837a0eb6548c02f362e83f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 16:05:03 -0400 Subject: [PATCH 5/6] Removed ruby-switch as it is no longer available for Ubuntu:14.04 (see http://askubuntu.com/questions/452243/what-versions-of-ruby-are-supported-in-14-04) Is it required now that Ruby 2.1 is out? --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b31d7364..faf95c24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get install -y software-properties-common && \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \ ruby2.1 ruby2.1-dev && \ - ruby-switch --set ruby2.0 && gem install --no-ri --no-rdoc bundler && \ + gem install --no-ri --no-rdoc bundler && \ apt-get clean # 20140418 ADD assets/setup/ /app/setup/ From 050bc993eafb021d732aacc263af5fb657a7efea Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 11:48:04 -0400 Subject: [PATCH 6/6] An issue with OpenSSH, when an account is locked it doesn't check the authorized_keys file anymore (see http://grid.ncsa.illinois.edu/ssh/ts_server.html, http://stackoverflow.com/questions/15664561/ssh-key-asks-for-password) Running passwd -d git fixes this --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index faf95c24..9426e6fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/