From b01d804c4d3e818d5a4db88d26592eee825509a1 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Fri, 4 Oct 2024 23:38:35 -0700 Subject: [PATCH 1/4] Install octave-networks-toolbox. --- Dockerfile.appendix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Dockerfile.appendix b/Dockerfile.appendix index f78e6f8..279c08d 100644 --- a/Dockerfile.appendix +++ b/Dockerfile.appendix @@ -15,4 +15,16 @@ RUN wget -O /tmp/gtrieScanner.zip https://www.dcc.fc.up.pt/gtries/gtrieScanner_s make -C /tmp/gtrieScanner_src_01 && \ install -o root -g root -m 0755 /tmp/gtrieScanner_src_01/gtrieScanner /usr/local/bin/ +# Install octave-networks-toolbox +RUN git clone --depth 1 \ + https://github.com/aeolianine/octave-networks-toolbox \ + /srv/octave-networks-toolbox && \ + cd /srv/octave-networks-toolbox/ && \ + git fetch --depth 1 origin 3bfab48 && \ + git checkout 3bfab48 + +# Add octave-networks-toolbox to octave path +RUN echo "addpath('/srv/octave-networks-toolbox')" >> \ + ${OCTAVE_HOME}/share/octave/site/m/startup/octaverc + USER $NB_USER From db18f152ee280ed0c5cee806b6e377ba7f7b6d97 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Fri, 4 Oct 2024 23:44:46 -0700 Subject: [PATCH 2/4] Simplify code checkout. --- Dockerfile.appendix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile.appendix b/Dockerfile.appendix index 279c08d..2482289 100644 --- a/Dockerfile.appendix +++ b/Dockerfile.appendix @@ -16,11 +16,9 @@ RUN wget -O /tmp/gtrieScanner.zip https://www.dcc.fc.up.pt/gtries/gtrieScanner_s install -o root -g root -m 0755 /tmp/gtrieScanner_src_01/gtrieScanner /usr/local/bin/ # Install octave-networks-toolbox -RUN git clone --depth 1 \ - https://github.com/aeolianine/octave-networks-toolbox \ +RUN git clone https://github.com/aeolianine/octave-networks-toolbox \ /srv/octave-networks-toolbox && \ cd /srv/octave-networks-toolbox/ && \ - git fetch --depth 1 origin 3bfab48 && \ git checkout 3bfab48 # Add octave-networks-toolbox to octave path From 63aa518ce14d0ce6649410ed2b18c4c99e64781d Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Sat, 5 Oct 2024 00:31:36 -0700 Subject: [PATCH 3/4] Update prefix variable. --- Dockerfile.appendix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.appendix b/Dockerfile.appendix index 2482289..4d52b1d 100644 --- a/Dockerfile.appendix +++ b/Dockerfile.appendix @@ -23,6 +23,6 @@ RUN git clone https://github.com/aeolianine/octave-networks-toolbox \ # Add octave-networks-toolbox to octave path RUN echo "addpath('/srv/octave-networks-toolbox')" >> \ - ${OCTAVE_HOME}/share/octave/site/m/startup/octaverc + ${CONDA_PREFIX}/share/octave/site/m/startup/octaverc USER $NB_USER From 16af218930ec2853a38ab256a1c70666ca755486 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Mon, 7 Oct 2024 12:48:35 -0700 Subject: [PATCH 4/4] Use full path. CONDA_PREFIX is not available in the appendix. (?) --- Dockerfile.appendix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.appendix b/Dockerfile.appendix index 4d52b1d..402f3d7 100644 --- a/Dockerfile.appendix +++ b/Dockerfile.appendix @@ -23,6 +23,6 @@ RUN git clone https://github.com/aeolianine/octave-networks-toolbox \ # Add octave-networks-toolbox to octave path RUN echo "addpath('/srv/octave-networks-toolbox')" >> \ - ${CONDA_PREFIX}/share/octave/site/m/startup/octaverc + /srv/conda/envs/notebook/share/octave/site/m/startup/octaverc USER $NB_USER