[ARVADOS-DEV] updated: 8568240aaa6b9dba2af675dc0d6e09fe1001abfd

git at public.curoverse.com git at public.curoverse.com
Tue Feb 16 13:30:39 EST 2016


Summary of changes:
 arvbox/bin/arvbox                               |  4 ++--
 arvbox/lib/arvbox/docker/Dockerfile.demo        | 12 ++++++------
 arvbox/lib/arvbox/docker/Dockerfile.dev         |  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 -
 7 files changed, 9 insertions(+), 13 deletions(-)
 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  8568240aaa6b9dba2af675dc0d6e09fe1001abfd (commit)
      from  aa65f4dc68b750a635c857c0480df3f5a2dca7a4 (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 8568240aaa6b9dba2af675dc0d6e09fe1001abfd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 16 10:16:55 2016 -0500

    Move services to /var/lib/arvbox/services because they include logs and logs
    don't go in /usr. no issue #

diff --git a/arvbox/bin/arvbox b/arvbox/bin/arvbox
index 10fac0d..7be361b 100755
--- a/arvbox/bin/arvbox
+++ b/arvbox/bin/arvbox
@@ -181,12 +181,12 @@ run() {
             docker exec -ti \
                    $ARVBOX_CONTAINER \
                    /usr/local/lib/arvbox/runsu.sh \
-                   /usr/local/lib/arvbox/service/sso/run-service --only-setup
+                   /var/lib/arvbox/service/sso/run-service --only-setup
 
             docker exec -ti \
                    $ARVBOX_CONTAINER \
                    /usr/local/lib/arvbox/runsu.sh \
-                   /usr/local/lib/arvbox/service/api/run-service --only-setup
+                   /var/lib/arvbox/service/api/run-service --only-setup
 
             docker exec -ti \
                    $ARVBOX_CONTAINER \
diff --git a/arvbox/lib/arvbox/docker/Dockerfile.demo b/arvbox/lib/arvbox/docker/Dockerfile.demo
index 1085abc..d3e36c6 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -6,9 +6,9 @@ RUN cd /usr/src && \
 
 RUN chown -R 1000:1000 /usr/src && /usr/local/lib/arvbox/createusers.sh
 
-RUN sudo -u arvbox /usr/local/lib/arvbox/service/sso/run-service --only-deps
-RUN sudo -u arvbox /usr/local/lib/arvbox/service/api/run-service --only-deps
-RUN sudo -u arvbox /usr/local/lib/arvbox/service/workbench/run-service --only-deps
-RUN sudo -u arvbox /usr/local/lib/arvbox/service/doc/run-service --only-deps
-RUN sudo -u arvbox /usr/local/lib/arvbox/service/vm/run-service --only-deps
-RUN sudo -u arvbox /usr/local/lib/arvbox/service/sdk/run-service
+RUN sudo -u arvbox /var/lib/arvbox/service/sso/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/api/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/workbench/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/doc/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/vm/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/sdk/run-service
diff --git a/arvbox/lib/arvbox/docker/Dockerfile.dev b/arvbox/lib/arvbox/docker/Dockerfile.dev
index 408e2de..5ec73bb 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/arvbox/lib/arvbox/docker/Dockerfile.dev
@@ -10,4 +10,4 @@ RUN set -e && \
  tar -C /usr/local -xjf /tmp/$PJS.tar.bz2 && \
  ln -s ../$PJS/bin/phantomjs /usr/local/bin/
 
-RUN mkdir /etc/test-service && ln -sf /usr/local/lib/arvbox/service/postgres /etc/test-service
+RUN mkdir /etc/test-service && ln -sf /var/lib/arvbox/service/postgres /etc/test-service
diff --git a/arvbox/lib/arvbox/docker/tests-service/docker b/arvbox/lib/arvbox/docker/tests-service/docker
deleted file mode 120000
index 9374f25..0000000
--- a/arvbox/lib/arvbox/docker/tests-service/docker
+++ /dev/null
@@ -1 +0,0 @@
-../service/docker
\ No newline at end of file
diff --git a/arvbox/lib/arvbox/docker/tests-service/logger b/arvbox/lib/arvbox/docker/tests-service/logger
deleted file mode 120000
index b30194b..0000000
--- a/arvbox/lib/arvbox/docker/tests-service/logger
+++ /dev/null
@@ -1 +0,0 @@
-../service/logger
\ No newline at end of file
diff --git a/arvbox/lib/arvbox/docker/tests-service/postgres b/arvbox/lib/arvbox/docker/tests-service/postgres
deleted file mode 120000
index 9b2d8a0..0000000
--- a/arvbox/lib/arvbox/docker/tests-service/postgres
+++ /dev/null
@@ -1 +0,0 @@
-../service/postgres
\ No newline at end of file
diff --git a/arvbox/lib/arvbox/docker/tests-service/runsu.sh b/arvbox/lib/arvbox/docker/tests-service/runsu.sh
deleted file mode 120000
index 22030b0..0000000
--- a/arvbox/lib/arvbox/docker/tests-service/runsu.sh
+++ /dev/null
@@ -1 +0,0 @@
-../service/runsu.sh
\ No newline at end of file

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list