[ARVADOS] updated: 3623287cdc05121a86e573b89aebb6e4aa6866b5
Git user
git at public.curoverse.com
Wed Oct 4 11:46:13 EDT 2017
Summary of changes:
tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 4 ++++
tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 4 ++++
tools/arvbox/lib/arvbox/docker/api-setup.sh | 9 +++++++--
tools/arvbox/lib/arvbox/docker/crunch-setup.sh | 10 ++++++++--
tools/arvbox/lib/arvbox/docker/service/api/run-service | 7 ++++++-
tools/arvbox/lib/arvbox/docker/service/gitolite/run-service | 11 ++++++++---
tools/arvbox/lib/arvbox/docker/service/sso/run-service | 8 ++++++--
tools/arvbox/lib/arvbox/docker/service/websockets/run-service | 8 +++++++-
tools/arvbox/lib/arvbox/docker/service/workbench/run-service | 9 +++++++--
9 files changed, 57 insertions(+), 13 deletions(-)
via 3623287cdc05121a86e573b89aebb6e4aa6866b5 (commit)
from 8fa3f0454b38da053ff27577c74bc98bfbcc2fb1 (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 3623287cdc05121a86e573b89aebb6e4aa6866b5
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Wed Oct 4 11:45:09 2017 -0400
arvbox: run the rails code in production mode when running in localdemo or
publicdemo.
refs #12355
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index 3d953ac..39bc21c 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -14,6 +14,10 @@ RUN cd /usr/src && \
ADD service/ /var/lib/arvbox/service
RUN ln -sf /var/lib/arvbox/service /etc
+RUN mkdir -p /var/lib/arvados
+RUN echo "production" > /var/lib/arvados/api_rails_env
+RUN echo "production" > /var/lib/arvados/sso_rails_env
+RUN echo "production" > /var/lib/arvados/workbench_rails_env
RUN chown -R 1000:1000 /usr/src && /usr/local/lib/arvbox/createusers.sh
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
index c017f70..e6e0397 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
@@ -7,5 +7,9 @@ ARG arvados_version
ADD service/ /var/lib/arvbox/service
RUN ln -sf /var/lib/arvbox/service /etc
+RUN mkdir -p /var/lib/arvados
+RUN echo "development" > /var/lib/arvados/api_rails_env
+RUN echo "development" > /var/lib/arvados/sso_rails_env
+RUN echo "development" > /var/lib/arvados/workbench_rails_env
RUN mkdir /etc/test-service && ln -sf /var/lib/arvbox/service/postgres /etc/test-service
diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index b81ba00..de64b06 100755
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -9,7 +9,12 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/arvados/services/api
-export RAILS_ENV=development
+
+if test -s /var/lib/arvados/api_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+ export RAILS_ENV=development
+fi
set -u
@@ -41,7 +46,7 @@ else
fi
cat >config/application.yml <<EOF
-development:
+$RAILS_ENV:
uuid_prefix: $uuid_prefix
secret_token: $secret_token
blob_signing_key: $blob_signing_key
diff --git a/tools/arvbox/lib/arvbox/docker/crunch-setup.sh b/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
index e4d0487..30ecafb 100755
--- a/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
@@ -18,6 +18,12 @@ flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/servi
flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/sdk/go/crunchrunner"
install bin/crunchstat bin/crunchrunner /usr/local/bin
+if test -s /var/lib/arvados/api_rails_env ; then
+ RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+ RAILS_ENV=development
+fi
+
export ARVADOS_API_HOST=$localip:${services[api]}
export ARVADOS_API_HOST_INSECURE=1
export ARVADOS_API_TOKEN=$(cat /usr/src/arvados/services/api/superuser_token)
@@ -33,7 +39,7 @@ export TZ='America/New_York'
cd /usr/src/arvados/services/api
if test "$1" = "crunch0" ; then
- exec bundle exec ./script/crunch-dispatch.rb development --jobs --pipelines
+ exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs --pipelines
else
- exec bundle exec ./script/crunch-dispatch.rb development --jobs
+ exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs
fi
diff --git a/tools/arvbox/lib/arvbox/docker/service/api/run-service b/tools/arvbox/lib/arvbox/docker/service/api/run-service
index 8cacb6a..f7ab6be 100755
--- a/tools/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/api/run-service
@@ -9,7 +9,12 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/arvados/services/api
-export RAILS_ENV=development
+
+if test -s /var/lib/arvados/api_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+ export RAILS_ENV=development
+fi
run_bundler --without=development
bundle exec passenger-config build-native-support
diff --git a/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service b/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service
index 4d6c8e3..a38e49a 100755
--- a/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/gitolite/run-service
@@ -99,12 +99,17 @@ else
fi
cd /usr/src/arvados/services/api
-export RAILS_ENV=development
+
+if test -s /var/lib/arvados/api_rails_env ; then
+ RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+ RAILS_ENV=development
+fi
git_user_key=$(cat ~git/.ssh/id_rsa.pub)
cat > config/arvados-clients.yml <<EOF
-development:
+$RAILS_ENV:
gitolite_url: /var/lib/arvados/git/repositories/gitolite-admin.git
gitolite_tmp: /var/lib/arvados/git
arvados_api_host: $localip:${services[api]}
@@ -114,6 +119,6 @@ development:
EOF
while true ; do
- bundle exec script/arvados-git-sync.rb development
+ bundle exec script/arvados-git-sync.rb $RAILS_ENV
sleep 120
done
diff --git a/tools/arvbox/lib/arvbox/docker/service/sso/run-service b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
index 3c319cb..ee35bb9 100755
--- a/tools/arvbox/lib/arvbox/docker/service/sso/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/sso/run-service
@@ -9,7 +9,11 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/sso
-export RAILS_ENV=development
+if test -s /var/lib/arvados/sso_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvados/sso_rails_env)
+else
+ export RAILS_ENV=development
+fi
run_bundler --without=development
bundle exec passenger start --runtime-check-only --runtime-dir=/var/lib/passenger
@@ -35,7 +39,7 @@ if ! test -s /var/lib/arvados/self-signed.key ; then
fi
cat >config/application.yml <<EOF
-development:
+$RAILS_ENV:
uuid_prefix: $uuid_prefix
secret_token: $secret_token
default_link_url: "http://$localip"
diff --git a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
index 88b0b50..cb56ac7 100755
--- a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
@@ -8,6 +8,12 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
+if test -s /var/lib/arvados/api_rails_env ; then
+ RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
+else
+ RAILS_ENV=development
+fi
+
mkdir -p /var/lib/gopath
cd /var/lib/gopath
@@ -28,7 +34,7 @@ Client:
APIHost: $localip:${services[api]}
Insecure: true
Postgres:
- dbname: arvados_development
+ dbname: arvados_$RAILS_ENV
user: arvados
password: $database_pw
host: localhost
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 7b9703f..8382a1c 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -9,7 +9,12 @@ set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/arvados/apps/workbench
-export RAILS_ENV=development
+
+if test -s /var/lib/arvados/workbench_rails_env ; then
+ export RAILS_ENV=$(cat /var/lib/arvados/workbench_rails_env)
+else
+ export RAILS_ENV=development
+fi
run_bundler --without=development
bundle exec passenger start --runtime-check-only --runtime-dir=/var/lib/passenger
@@ -32,7 +37,7 @@ if ! test -s self-signed.key ; then
fi
cat >config/application.yml <<EOF
-development:
+$RAILS_ENV:
secret_token: $secret_token
arvados_login_base: https://$localip:${services[api]}/login
arvados_v1_base: https://$localip:${services[api]}/arvados/v1
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list