projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18657: Fix passenger-config not found by installing binstub & using that
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
service
/
api
/
run-service
diff --git
a/tools/arvbox/lib/arvbox/docker/service/api/run-service
b/tools/arvbox/lib/arvbox/docker/service/api/run-service
index 5f72f1c613192e5b8aa806a0f490711b6055ff69..ad18e3cc8d79af7a686eb9c1935d146c8be3ff11 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/api/run-service
@@
-1,4
+1,7
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
exec 2>&1
set -ex -o pipefail
exec 2>&1
set -ex -o pipefail
@@
-6,23
+9,28
@@
set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
cd /usr/src/arvados/services/api
. /usr/local/lib/arvbox/common.sh
cd /usr/src/arvados/services/api
-export RAILS_ENV=development
+
+if test -s $ARVADOS_CONTAINER_PATH/api_rails_env ; then
+ export RAILS_ENV=$(cat $ARVADOS_CONTAINER_PATH/api_rails_env)
+else
+ export RAILS_ENV=development
+fi
run_bundler --without=development
run_bundler --without=development
-
bundle exec
passenger-config build-native-support
-
bundle exec
passenger-config install-standalone-runtime
+
flock $GEM_HOME/gems.lock bin/
passenger-config build-native-support
+
flock $GEM_HOME/gems.lock bin/
passenger-config install-standalone-runtime
if test "$1" = "--only-deps" ; then
exit
fi
if test "$1" = "--only-deps" ; then
exit
fi
-flock
/var/lib/arvados
/api.lock /usr/local/lib/arvbox/api-setup.sh
+flock
$ARVADOS_CONTAINER_PATH
/api.lock /usr/local/lib/arvbox/api-setup.sh
set +u
if test "$1" = "--only-setup" ; then
exit
fi
set +u
if test "$1" = "--only-setup" ; then
exit
fi
-exec bundle exec passenger start --port=${services[api]} \
- --ssl --ssl-certificate=/var/lib/arvados/self-signed.pem \
- --ssl-certificate-key=/var/lib/arvados/self-signed.key
+touch $ARVADOS_CONTAINER_PATH/api.ready
+
+exec bin/passenger start --port=${services[api]}