[ARVADOS] updated: b6bb61bb11ad530e281791c528aad5bc59bba6e4
git at public.curoverse.com
git at public.curoverse.com
Tue Dec 31 01:28:26 EST 2013
Summary of changes:
docker/Makefile | 1 +
docker/api/Dockerfile | 8 ++++----
docker/base/Dockerfile | 21 ++++++++++-----------
docker/doc/Dockerfile | 11 ++++++-----
docker/passenger/Dockerfile | 5 +++--
docker/sso/Dockerfile | 18 ++++++++++--------
docker/workbench/Dockerfile | 15 ++++++++-------
7 files changed, 42 insertions(+), 37 deletions(-)
via b6bb61bb11ad530e281791c528aad5bc59bba6e4 (commit)
via e09fb44b7bf2d5682b8cc03091c6db1c2ea35580 (commit)
from b481a5167f6c50bf04fb9aae7bb07caa1a1add6e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b6bb61bb11ad530e281791c528aad5bc59bba6e4
Merge: e09fb44 b481a51
Author: Tim Pierce <twp at curoverse.com>
Date: Tue Dec 31 01:28:10 2013 -0500
Merge branch 'master' of git.clinicalfuture.com:arvados
commit e09fb44b7bf2d5682b8cc03091c6db1c2ea35580
Author: Tim Pierce <twp at curoverse.com>
Date: Tue Dec 31 01:26:24 2013 -0500
Fix makefile brittleness.
* `clean' should remove any empty */generated directories (so
base/generated will be marked as a target to rebuild)
* Dockerfiles should use && instead of ; whenever possible so
`docker build' will properly fail if a critical step cannot
be completed.
diff --git a/docker/Makefile b/docker/Makefile
index ae19ac0..45ffe5e 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -4,6 +4,7 @@ all: api-image doc-image workbench-image warehouse-image sso-image
# but does not remove any docker images generated in previous builds
clean:
-rm *-image */generated/*
+ - at rmdir */generated
# `make realclean' will also remove the docker images and force
# subsequent makes to build the entire chain from the ground up
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 4401ac0..9394414 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -40,10 +40,10 @@ RUN sh /tmp/config_databases.sh && \
# Configure Apache and Passenger.
ADD passenger.conf /etc/apache2/conf.d/passenger
-RUN a2dissite default ; \
- a2ensite arvados ; \
- a2enmod rewrite ; \
- a2enmod ssl ; \
+RUN a2dissite default && \
+ a2ensite arvados && \
+ a2enmod rewrite && \
+ a2enmod ssl && \
/bin/mkdir /var/run/apache2
# Supervisor.
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index fe6844f..5bbee24 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -10,12 +10,12 @@ ENV DEBIAN_FRONTEND noninteractive
# * git, curl, rvm
# * Arvados source code in /usr/src/arvados-upstream, for preseeding gem installation
-RUN apt-get update ;\
- apt-get -q -y install -q -y openssh-server apt-utils git curl locales postgresql-server-dev-9.1 ;\
- /bin/mkdir -p /root/.ssh ;\
- /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen ;\
- /usr/sbin/locale-gen ;\
- curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0 ;\
+RUN apt-get update && \
+ apt-get -q -y install -q -y openssh-server apt-utils git curl locales postgresql-server-dev-9.1 && \
+ /bin/mkdir -p /root/.ssh && \
+ /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+ /usr/sbin/locale-gen && \
+ curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0 && \
git clone https://github.com/clinicalfuture/arvados.git /usr/src/arvados-upstream
# Set up RVM environment. These are just the env variables created by
@@ -27,11 +27,10 @@ ENV PATH /usr/local/rvm/gems/ruby-2.0.0-p353/bin:/usr/local/rvm/gems/ruby-2.0.0-
# Update gem. This (hopefully) fixes
# https://github.com/rubygems/rubygems.org/issues/613.
-RUN gem update --system
-
-RUN gem install bundler ;\
- bundle install --gemfile=/usr/src/arvados-upstream/apps/workbench/Gemfile ;\
- bundle install --gemfile=/usr/src/arvados-upstream/services/api/Gemfile ;\
+RUN gem update --system && \
+ gem install bundler && \
+ bundle install --gemfile=/usr/src/arvados-upstream/apps/workbench/Gemfile && \
+ bundle install --gemfile=/usr/src/arvados-upstream/services/api/Gemfile && \
bundle install --gemfile=/usr/src/arvados-upstream/doc/Gemfile
ADD generated/id_rsa.pub /root/.ssh/authorized_keys
diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 0473e87..5ae4bb2 100644
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -4,20 +4,21 @@ FROM arvados/base
maintainer Ward Vandewege <ward at clinicalfuture.com>
# Install packages
-RUN /bin/mkdir -p /usr/src/arvados ;\
- apt-get update ;\
+RUN /bin/mkdir -p /usr/src/arvados && \
+ apt-get update && \
apt-get install -q -y curl procps apache2-mpm-worker
ADD generated/doc.tar.gz /usr/src/arvados/
# Build static site
-RUN /bin/sed -ri 's/^baseurl: .*$/baseurl: /' /usr/src/arvados/doc/_config.yml ;\
- cd /usr/src/arvados/doc; LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" jekyll build
+RUN /bin/sed -ri 's/^baseurl: .*$/baseurl: /' /usr/src/arvados/doc/_config.yml && \
+ cd /usr/src/arvados/doc && \
+ LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" jekyll build
# Configure Apache
ADD apache2_vhost /etc/apache2/sites-available/doc
RUN \
- a2dissite default ;\
+ a2dissite default && \
a2ensite doc
ADD apache2_foreground.sh /etc/apache2/foreground.sh
diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index 8bb017c..45ef9ae 100644
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -4,8 +4,9 @@ FROM arvados/base
MAINTAINER Ward Vandewege <ward at clinicalfuture.com>
# Install packages and build the passenger apache module
-RUN apt-get update ;\
+RUN apt-get update && \
apt-get install -q -y apt-utils git curl procps apache2-mpm-worker \
- libcurl4-openssl-dev apache2-threaded-dev libapr1-dev libaprutil1-dev ;\
+ libcurl4-openssl-dev apache2-threaded-dev \
+ libapr1-dev libaprutil1-dev && \
passenger-install-apache2-module --auto
diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index f5dc2af..2933788 100644
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -3,7 +3,7 @@
FROM arvados/passenger
MAINTAINER Ward Vandewege <ward at clinicalfuture.com>
-RUN git clone git://github.com/clinicalfuture/sso-devise-omniauth-provider.git /usr/src/sso-provider ;\
+RUN git clone git://github.com/clinicalfuture/sso-devise-omniauth-provider.git /usr/src/sso-provider && \
bundle install --gemfile=/usr/src/sso-provider/Gemfile
# Install generated config files
@@ -14,13 +14,15 @@ ADD generated/apache2_vhost /etc/apache2/sites-available/sso-provider
# Configure Apache and Passenger.
ADD passenger.conf /etc/apache2/conf.d/passenger
-RUN a2dissite default ; \
- a2ensite sso-provider ; \
- a2enmod rewrite ; \
- a2enmod ssl ; \
- cd /usr/src/sso-provider; RAILS_ENV=production rake db:setup ; rake assets:precompile ; \
- chown www-data:www-data tmp_omniauth log config.ru -R ; \
- chown www-data:www-data db db/production.sqlite3 ; \
+RUN a2dissite default && \
+ a2ensite sso-provider && \
+ a2enmod rewrite && \
+ a2enmod ssl && \
+ cd /usr/src/sso-provider && \
+ RAILS_ENV=production rake db:setup && \
+ rake assets:precompile && \
+ chown www-data:www-data tmp_omniauth log config.ru -R && \
+ chown www-data:www-data db db/production.sqlite3 && \
/bin/mkdir /var/run/apache2
ADD apache2_foreground.sh /etc/apache2/foreground.sh
diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index fbf1821..7bbc245 100644
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -7,17 +7,18 @@ MAINTAINER Ward Vandewege <ward at clinicalfuture.com>
RUN /bin/mkdir -p /usr/src/arvados/apps
ADD generated/workbench.tar.gz /usr/src/arvados/apps/
-RUN touch /usr/src/arvados/apps/workbench/log/production.log ;\
- chmod 666 /usr/src/arvados/apps/workbench/log/production.log ;\
- touch /usr/src/arvados/apps/workbench/db/production.sqlite3 ;\
- bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile ;\
- cd /usr/src/arvados/apps/workbench; rake assets:precompile
+RUN touch /usr/src/arvados/apps/workbench/log/production.log && \
+ chmod 666 /usr/src/arvados/apps/workbench/log/production.log && \
+ touch /usr/src/arvados/apps/workbench/db/production.sqlite3 && \
+ bundle install --gemfile=/usr/src/arvados/apps/workbench/Gemfile && \
+ cd /usr/src/arvados/apps/workbench && \
+ rake assets:precompile
# Configure Apache
ADD generated/apache2_vhost /etc/apache2/sites-available/workbench
RUN \
- a2dissite default ;\
- a2ensite workbench ;\
+ a2dissite default && \
+ a2ensite workbench && \
a2enmod rewrite
# Set up the production environment
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list