Move services to /var/lib/arvbox/services because they include logs and logs

don't go in /usr. no issue #

diff --git a/bin/arvbox b/bin/arvbox
index 10fac0db5503787fc1d2cf0a7e45f78600b02c3a..7be361b8783c4ada17e2a215fbbcf0184621f9ce 100755 (executable)
--- a/bin/arvbox
+++ b/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/lib/arvbox/docker/Dockerfile.demo b/lib/arvbox/docker/Dockerfile.demo
index 1085abc9ebf214ffde749e77609e4b6282043c75..d3e36c63b2ae8dad3f1548599b0a2042e63fc38d 100644 (file)
--- a/lib/arvbox/docker/Dockerfile.demo
+++ b/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/lib/arvbox/docker/Dockerfile.dev b/lib/arvbox/docker/Dockerfile.dev
index 408e2deb53621efa2906b2d16043ccb104d8906d..5ec73bbe68476873675ac703a64e10d89a93cb42 100644 (file)
--- a/lib/arvbox/docker/Dockerfile.dev
+++ b/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/lib/arvbox/docker/tests-service/docker b/lib/arvbox/docker/tests-service/docker
deleted file mode 120000 (symlink)
index 9374f25..0000000
--- a/lib/arvbox/docker/tests-service/docker
+++ /dev/null
@@ -1 +0,0 @@
-../service/docker
\ No newline at end of file

diff --git a/lib/arvbox/docker/tests-service/logger b/lib/arvbox/docker/tests-service/logger
deleted file mode 120000 (symlink)
index b30194b..0000000
--- a/lib/arvbox/docker/tests-service/logger
+++ /dev/null
@@ -1 +0,0 @@
-../service/logger
\ No newline at end of file

diff --git a/lib/arvbox/docker/tests-service/postgres b/lib/arvbox/docker/tests-service/postgres
deleted file mode 120000 (symlink)
index 9b2d8a0..0000000
--- a/lib/arvbox/docker/tests-service/postgres
+++ /dev/null
@@ -1 +0,0 @@
-../service/postgres
\ No newline at end of file

diff --git a/lib/arvbox/docker/tests-service/runsu.sh b/lib/arvbox/docker/tests-service/runsu.sh
deleted file mode 120000 (symlink)
index 22030b0..0000000
--- a/lib/arvbox/docker/tests-service/runsu.sh
+++ /dev/null
@@ -1 +0,0 @@
-../service/runsu.sh
\ No newline at end of file