[ARVADOS-DEV] updated: d7bda40439a964ab2117933aba3694cb635e23dc
Git user
git at public.curoverse.com
Sat Feb 20 04:49:29 EST 2016
Summary of changes:
arvbox/README.md | 5 ++++
arvbox/bin/arvbox | 27 +++++++++++++---------
arvbox/lib/arvbox/docker/Dockerfile.base | 20 ++++++++++++----
arvbox/lib/arvbox/docker/Dockerfile.demo | 12 +++++-----
arvbox/lib/arvbox/docker/Dockerfile.dev | 2 +-
.../lib/arvbox/docker/application_yml_override.py | 24 +++++++++++++++++++
arvbox/lib/arvbox/docker/service/api/run-service | 2 ++
.../log/main/.gitstub | 0
.../{workbench => crunch-dispatch-local}/log/run | 0
.../service/{sso => crunch-dispatch-local}/run | 0
.../run-service | 7 +++---
arvbox/lib/arvbox/docker/service/sso/run-service | 2 ++
.../arvbox/docker/service/workbench/run-service | 2 ++
arvbox/lib/arvbox/docker/tests-service/docker | 1 -
arvbox/lib/arvbox/docker/tests-service/logger | 1 -
arvbox/lib/arvbox/docker/tests-service/postgres | 1 -
arvbox/lib/arvbox/docker/tests-service/runsu.sh | 1 -
.../package-build-dockerfiles/centos6/Dockerfile | 2 +-
.../package-build-dockerfiles/debian7/Dockerfile | 2 +-
.../package-build-dockerfiles/debian8/Dockerfile | 2 +-
.../ubuntu1204/Dockerfile | 2 +-
.../ubuntu1404/Dockerfile | 2 +-
.../package-test-dockerfiles/debian7/Dockerfile | 3 +++
.../package-test-dockerfiles/debian8/Dockerfile | 3 +++
.../package-test-dockerfiles/ubuntu1204/Dockerfile | 3 +++
.../package-test-dockerfiles/ubuntu1404/Dockerfile | 3 +++
jenkins/run-build-packages.sh | 18 +++++++--------
jenkins/run-library.sh | 6 +++++
28 files changed, 109 insertions(+), 44 deletions(-)
create mode 100755 arvbox/lib/arvbox/docker/application_yml_override.py
copy arvbox/lib/arvbox/docker/service/{workbench => crunch-dispatch-local}/log/main/.gitstub (100%)
copy arvbox/lib/arvbox/docker/service/{workbench => crunch-dispatch-local}/log/run (100%)
copy arvbox/lib/arvbox/docker/service/{sso => crunch-dispatch-local}/run (100%)
copy arvbox/lib/arvbox/docker/service/{keep-web => crunch-dispatch-local}/run-service (62%)
delete mode 120000 arvbox/lib/arvbox/docker/tests-service/docker
delete mode 120000 arvbox/lib/arvbox/docker/tests-service/logger
delete mode 120000 arvbox/lib/arvbox/docker/tests-service/postgres
delete mode 120000 arvbox/lib/arvbox/docker/tests-service/runsu.sh
via d7bda40439a964ab2117933aba3694cb635e23dc (commit)
via 65a3779e6968835bc0b1fc1b103a408fd4eec4aa (commit)
via 726ff8da135916c0cd6e3e0e4c9614a91d3ccfca (commit)
via 8568240aaa6b9dba2af675dc0d6e09fe1001abfd (commit)
via aa65f4dc68b750a635c857c0480df3f5a2dca7a4 (commit)
via 819ffb0ad38eb1f86ab6b6e3c4ae7c860b465636 (commit)
via 6f19089ca96e485f457932dce44256e46f1e3711 (commit)
via bb26448a7551a9165e8674ade83e32f4d17adc9a (commit)
via 48e6cb38b2e0c023589d4083192190bdc30c4762 (commit)
from 07c05348740cd932e54aecfa52bf2a1260b3948e (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 d7bda40439a964ab2117933aba3694cb635e23dc
Merge: 07c0534 65a3779
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Feb 20 04:49:20 2016 -0500
Merge branch 'master' into 8345-llfuse-unpin
Conflicts:
jenkins/run-build-packages.sh
diff --cc jenkins/run-build-packages.sh
index d850cb2,ec19b28..ccea8a2
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@@ -89,10 -89,10 +89,10 @@@ case "$TARGET" i
PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON3_PKG_PREFIX=python3
- PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
- oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+ oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@@ -102,10 -102,10 +102,10 @@@
PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON3_PKG_PREFIX=python3
- PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
- oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+ oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@@ -115,11 -115,10 +115,11 @@@
PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON3_PKG_PREFIX=python3
- PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
- oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+ oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse \
+ contextlib2 \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@@ -129,8 -128,8 +129,8 @@@
PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON3_PKG_PREFIX=python3
- PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
+ PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse ciso8601 \
- google-api-python-client six uritemplate oauth2client httplib2 \
+ google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \
rsa 'pycurl<7.21.5' backports.ssl_match_hostname)
PYTHON3_BACKPORTS=(docker-py requests websocket-client)
;;
@@@ -140,11 -139,11 +140,11 @@@
PYTHON2_PKG_PREFIX=$PYTHON2_PACKAGE
PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
- PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
- oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+ PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+ oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \
- python-daemon lockfile llfuse==0.41.1 'pbr<1.0')
+ python-daemon lockfile llfuse 'pbr<1.0')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
export PYCURL_SSL_LIBRARY=nss
;;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list