[ARVADOS] updated: 0730fad8bf3233751135e7f03bc6f45937b8d835
git at public.curoverse.com
git at public.curoverse.com
Wed Feb 12 14:43:39 EST 2014
Summary of changes:
docker/api/Dockerfile | 2 +-
docker/api/apache2_vhost.in | 4 ++--
docker/base/Dockerfile | 4 ++--
docker/config.rb | 2 ++
docker/config.yml.example | 2 +-
docker/doc/Dockerfile | 2 +-
docker/doc/apache2_vhost | 2 +-
docker/passenger/Dockerfile | 2 +-
docker/postgresql/Dockerfile | 2 +-
docker/sso/Dockerfile | 4 ++--
docker/sso/apache2_vhost.in | 4 ++--
docker/warehouse/Dockerfile | 4 ++--
docker/workbench/Dockerfile | 2 +-
docker/workbench/apache2_vhost.in | 2 +-
14 files changed, 20 insertions(+), 18 deletions(-)
via 0730fad8bf3233751135e7f03bc6f45937b8d835 (commit)
via 889d002fa79a29eb1d18731090f844380874d42f (commit)
from 77e12f54c6b5e97abb1f045163658f7deb31d5c4 (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 0730fad8bf3233751135e7f03bc6f45937b8d835
Author: Ward Vandewege <ward at curoverse.com>
Date: Wed Feb 12 14:41:39 2014 -0500
Rename clinicalfuture -> curoverse everywhere.
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 9394414..d7fe554 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,7 +1,7 @@
# Arvados API server Docker container.
FROM arvados/passenger
-MAINTAINER Tim Pierce <twp at clinicalfuture.com>
+MAINTAINER Tim Pierce <twp at curoverse.com>
# Install postgres and apache.
# Clone a git repository of Arvados source -- not used to build, but
diff --git a/docker/api/apache2_vhost.in b/docker/api/apache2_vhost.in
index d29be24..fdbb2f9 100644
--- a/docker/api/apache2_vhost.in
+++ b/docker/api/apache2_vhost.in
@@ -2,7 +2,7 @@
<VirtualHost *:80>
ServerName @@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin at clinicalfuture.com
+ ServerAdmin sysadmin at curoverse.com
RedirectPermanent / https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/
@@ -14,7 +14,7 @@
<VirtualHost *:443>
ServerName @@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin at clinicalfuture.com
+ ServerAdmin sysadmin at curoverse.com
RailsEnv production
RackBaseURI /
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 5bbee24..66fa89e 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -2,7 +2,7 @@
# Based on Debian Wheezy
FROM arvados/debian:wheezy
-MAINTAINER Tim Pierce <twp at clinicalfuture.com>
+MAINTAINER Tim Pierce <twp at curoverse.com>
ENV DEBIAN_FRONTEND noninteractive
@@ -16,7 +16,7 @@ RUN apt-get update && \
/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
+ git clone https://github.com/curoverse/arvados.git /usr/src/arvados-upstream
# Set up RVM environment. These are just the env variables created by
# /usr/local/rvm/scripts/rvm, which can't be run from a non-login shell.
diff --git a/docker/config.yml.example b/docker/config.yml.example
index 6ada7f8..da06fee 100644
--- a/docker/config.yml.example
+++ b/docker/config.yml.example
@@ -70,7 +70,7 @@ WORKBENCH_DATA_EXPORT_DIR: /data/arvados-workbench-download/data
WORKBENCH_VCF_PIPELINE_UUID:
WORKBENCH_SITE_NAME: Arvados Workbench
WORKBENCH_INSECURE_HTTPS: true
-WORKBENCH_ACTIVATION_CONTACT_LINK: mailto:arvados at clinicalfuture.com
+WORKBENCH_ACTIVATION_CONTACT_LINK: mailto:arvados at curoverse.com
WORKBENCH_ARVADOS_LOGIN_BASE: https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/login
WORKBENCH_ARVADOS_V1_BASE: https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/arvados/v1
WORKBENCH_SECRET:
diff --git a/docker/doc/Dockerfile b/docker/doc/Dockerfile
index 39c87a8..3992881 100644
--- a/docker/doc/Dockerfile
+++ b/docker/doc/Dockerfile
@@ -1,7 +1,7 @@
# Arvados Documentation Docker container.
FROM arvados/base
-maintainer Ward Vandewege <ward at clinicalfuture.com>
+maintainer Ward Vandewege <ward at curoverse.com>
# Install packages
RUN /bin/mkdir -p /usr/src/arvados && \
diff --git a/docker/doc/apache2_vhost b/docker/doc/apache2_vhost
index bf9c18b..3a07776 100644
--- a/docker/doc/apache2_vhost
+++ b/docker/doc/apache2_vhost
@@ -2,7 +2,7 @@
ServerName doc.arvados.org
<VirtualHost *:80>
- ServerAdmin sysadmin at clinicalfuture.com
+ ServerAdmin sysadmin at curoverse.com
ServerName doc.arvados.org
diff --git a/docker/passenger/Dockerfile b/docker/passenger/Dockerfile
index 45ef9ae..2db48ab 100644
--- a/docker/passenger/Dockerfile
+++ b/docker/passenger/Dockerfile
@@ -1,7 +1,7 @@
# Arvados passenger image
FROM arvados/base
-MAINTAINER Ward Vandewege <ward at clinicalfuture.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install packages and build the passenger apache module
RUN apt-get update && \
diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile
index c26cda2..b6fed4e 100644
--- a/docker/postgresql/Dockerfile
+++ b/docker/postgresql/Dockerfile
@@ -1,7 +1,7 @@
# PostgreSQL Docker container for Arvados.
FROM arvados/debian:wheezy
-MAINTAINER Tim Pierce <twp at clinicalfuture.com>
+MAINTAINER Tim Pierce <twp at curoverse.com>
# TODO(twp): parameterize variables via autoconf or similar.
ENV POSTGRES_ROOT_PW dummy_pw
diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index 2933788..7ed8929 100644
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -1,9 +1,9 @@
# Arvados API server Docker container.
FROM arvados/passenger
-MAINTAINER Ward Vandewege <ward at clinicalfuture.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
-RUN git clone git://github.com/clinicalfuture/sso-devise-omniauth-provider.git /usr/src/sso-provider && \
+RUN git clone git://github.com/curoverse/sso-devise-omniauth-provider.git /usr/src/sso-provider && \
bundle install --gemfile=/usr/src/sso-provider/Gemfile
# Install generated config files
diff --git a/docker/sso/apache2_vhost.in b/docker/sso/apache2_vhost.in
index c84656d..554a86d 100644
--- a/docker/sso/apache2_vhost.in
+++ b/docker/sso/apache2_vhost.in
@@ -2,7 +2,7 @@
<VirtualHost *:80>
ServerName @@SSO_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin at clinicalfuture.com
+ ServerAdmin sysadmin at curoverse.com
RedirectPermanent / https://@@SSO_HOSTNAME@@.@@ARVADOS_DOMAIN@@/
@@ -14,7 +14,7 @@
<VirtualHost *:443>
ServerName @@SSO_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin at clinicalfuture.com
+ ServerAdmin sysadmin at curoverse.com
RailsEnv production
RackBaseURI /
diff --git a/docker/warehouse/Dockerfile b/docker/warehouse/Dockerfile
index dcc410b..ff168b5 100644
--- a/docker/warehouse/Dockerfile
+++ b/docker/warehouse/Dockerfile
@@ -1,5 +1,5 @@
FROM arvados/base
-MAINTAINER Tim Pierce <twp at clinicalfuture.com>
+MAINTAINER Tim Pierce <twp at curoverse.com>
RUN apt-get update && \
apt-get -q -y install dpkg-dev debhelper libdbi-perl libwww-perl \
@@ -14,7 +14,7 @@ RUN apt-get update && \
RUN \
perl -MCPAN -e 'install MogileFS::Client;' \
-e 'install Crypt::GpgME' && \
- git clone https://github.com/clinicalfuture/warehouse-apps.git /usr/src/warehouse-apps && \
+ git clone https://github.com/curoverse/warehouse-apps.git /usr/src/warehouse-apps && \
rm /usr/src/warehouse-apps/libwarehouse-perl/t/pod-coverage.t && \
cd /usr/src/warehouse-apps && \
sh install.sh /usr/local && \
diff --git a/docker/workbench/Dockerfile b/docker/workbench/Dockerfile
index 7bbc245..fea6947 100644
--- a/docker/workbench/Dockerfile
+++ b/docker/workbench/Dockerfile
@@ -1,7 +1,7 @@
# Arvados Workbench Docker container.
FROM arvados/passenger
-MAINTAINER Ward Vandewege <ward at clinicalfuture.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
# Update Arvados source
RUN /bin/mkdir -p /usr/src/arvados/apps
diff --git a/docker/workbench/apache2_vhost.in b/docker/workbench/apache2_vhost.in
index c950c4e..05376ea 100644
--- a/docker/workbench/apache2_vhost.in
+++ b/docker/workbench/apache2_vhost.in
@@ -1,7 +1,7 @@
<VirtualHost *:80>
ServerName workbench.@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@
- ServerAdmin sysadmin at clinicalfuture.com
+ ServerAdmin sysadmin at curoverse.com
RailsEnv @@WORKBENCH_RAILS_MODE@@
RackBaseURI /
commit 889d002fa79a29eb1d18731090f844380874d42f
Author: Ward Vandewege <ward at curoverse.com>
Date: Wed Feb 12 14:36:24 2014 -0500
Make sure to abort nicely when run with a version of ruby older than 1.9.3
diff --git a/docker/config.rb b/docker/config.rb
index c663524..5e7242b 100755
--- a/docker/config.rb
+++ b/docker/config.rb
@@ -3,6 +3,8 @@
require 'yaml'
require 'fileutils'
+abort 'Error: Ruby >= 1.9.3 required.' if RUBY_VERSION < '1.9.3'
+
# Initialize config settings from config.yml
config = YAML.load_file('config.yml')
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list