[arvados] updated: 2.7.0-5819-g83ed86d4d0

[git repository hosting]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base         | 3 +--
 tools/arvbox/lib/arvbox/docker/service/doc/run-service | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

       via  83ed86d4d016d345cdadf2b33d140a5c5af59938 (commit)
       via  10b7d3955d7906349f4ad30841c89bfc9663c82b (commit)
      from  7bfde74c810b997a300b42a007b096a30233d8a1 (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 83ed86d4d016d345cdadf2b33d140a5c5af59938
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Jan 15 09:52:29 2024 -0500

    21230: Activate virtualenv in arvbox doc service
    
    Generating the PySDK docs needs to actually import pdoc, not just run
    it. Given this, linking pdoc in /usr/local/bin/ is probably more
    confusing than helpful, so don't.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 6a03b303f7..a235274d31 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -102,8 +102,7 @@ RUN $GOPATH/bin/arvados-server install -type test
 # Everything else is installed by the sdk service on boot.
 RUN python3 -m venv /opt/arvados-py \
  && /opt/arvados-py/bin/pip install --no-cache-dir wheel \
- && /opt/arvados-py/bin/pip install --no-cache-dir setuptools PyYAML pdoc \
- && ln -s /opt/arvados-py/bin/pdoc /usr/local/bin/
+ && /opt/arvados-py/bin/pip install --no-cache-dir setuptools PyYAML pdoc
 
 RUN /etc/init.d/postgresql start && \
     su postgres -c 'dropuser arvados' && \
diff --git a/tools/arvbox/lib/arvbox/docker/service/doc/run-service b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
index 640f652c40..0a04918012 100755
--- a/tools/arvbox/lib/arvbox/docker/service/doc/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
@@ -27,4 +27,6 @@ if test "$1" = "--only-deps" ; then
     exit
 fi
 
+# Active the arvbox virtualenv so we can import pdoc for PySDK doc generation.
+. /opt/arvados-py/bin/activate
 flock $GEMLOCK bundle exec rake generate baseurl=http://$localip:${services[doc]} arvados_api_host=$localip:${services[controller-ssl]} arvados_workbench_host=http://$localip

commit 10b7d3955d7906349f4ad30841c89bfc9663c82b
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Jan 15 09:47:30 2024 -0500

    21230: Clean up directory state in arvbox doc service
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/doc/run-service b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
index 8d3fdc8365..640f652c40 100755
--- a/tools/arvbox/lib/arvbox/docker/service/doc/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
@@ -19,14 +19,12 @@ run_bundler --without=development
 
 # Generating the Python and R docs is expensive, so for development if the file
 # "no-sdk" exists then skip installing R stuff.
-if [[ ! -f /usr/src/arvados/doc/no-sdk ]] ; then
-    cd /usr/src/arvados/sdk/R
-    R --quiet --vanilla --file=install_deps.R
+if [[ ! -f no-sdk ]] ; then
+    env -C ../sdk/R R --quiet --vanilla --file=install_deps.R
 fi
 
 if test "$1" = "--only-deps" ; then
     exit
 fi
 
-cd /usr/src/arvados/doc
 flock $GEMLOCK bundle exec rake generate baseurl=http://$localip:${services[doc]} arvados_api_host=$localip:${services[controller-ssl]} arvados_workbench_host=http://$localip

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


hooks/post-receive
--