Skip to content

Commit 0284f21

Browse files
committed
FIX: correct octave's libgcc_s.so.1 issue
1 parent d527899 commit 0284f21

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by Neurodocker version 0.4.2-dev
2-
# Timestamp: 2018-10-05 09:48:03 UTC
2+
# Timestamp: 2018-10-09 20:48:57 UTC
33
#
44
# Thank you for using Neurodocker. If you discover any issues
55
# or ways to improve this software, please submit an issue or
@@ -63,6 +63,8 @@ RUN apt-get update -qq \
6363

6464
RUN sed -i '$isource /etc/fsl/fsl.sh' $ND_ENTRYPOINT
6565

66+
ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib"
67+
6668
ENV FORCE_SPMMCR="1" \
6769
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmcr-2010a/v713/runtime/glnxa64:/opt/matlabmcr-2010a/v713/bin/glnxa64:/opt/matlabmcr-2010a/v713/sys/os/glnxa64:/opt/matlabmcr-2010a/v713/extern/bin/glnxa64" \
6870
MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"
@@ -208,6 +210,12 @@ RUN echo '{ \
208210
\n "source /etc/fsl/fsl.sh" \
209211
\n ], \
210212
\n [ \
213+
\n "env", \
214+
\n { \
215+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib" \
216+
\n } \
217+
\n ], \
218+
\n [ \
211219
\n "spm12", \
212220
\n { \
213221
\n "version": "r7219" \

Singularity

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by Neurodocker version 0.4.2-dev
2-
# Timestamp: 2018-10-05 09:48:04 UTC
2+
# Timestamp: 2018-10-09 20:48:58 UTC
33
#
44
# Thank you for using Neurodocker. If you discover any issues
55
# or ways to improve this software, please submit an issue or
@@ -202,6 +202,12 @@ echo '{
202202
\n "source /etc/fsl/fsl.sh"
203203
\n ],
204204
\n [
205+
\n "env",
206+
\n {
207+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib"
208+
\n }
209+
\n ],
210+
\n [
205211
\n "spm12",
206212
\n {
207213
\n "version": "r7219"
@@ -313,6 +319,7 @@ echo '{
313319
export LANG="en_US.UTF-8"
314320
export LC_ALL="en_US.UTF-8"
315321
export ND_ENTRYPOINT="/neurodocker/startup.sh"
322+
export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib"
316323
export FORCE_SPMMCR="1"
317324
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmcr-2010a/v713/runtime/glnxa64:/opt/matlabmcr-2010a/v713/bin/glnxa64:/opt/matlabmcr-2010a/v713/sys/os/glnxa64:/opt/matlabmcr-2010a/v713/extern/bin/glnxa64"
318325
export MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"

generate.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ generate_docker() {
1111
git-annex-standalone vim emacs-nox nano less ncdu \
1212
tig git-annex-remote-rclone octave netbase \
1313
--add-to-entrypoint "source /etc/fsl/fsl.sh" \
14+
--env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib" \
1415
--spm12 version=r7219 \
1516
--user=neuro \
1617
--miniconda miniconda_version="4.3.31" \
@@ -48,6 +49,7 @@ generate_singularity() {
4849
git-annex-standalone vim emacs-nox nano less ncdu \
4950
tig git-annex-remote-rclone octave netbase \
5051
--add-to-entrypoint "source /etc/fsl/fsl.sh" \
52+
--env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib" \
5153
--spm12 version=r7219 \
5254
--user=neuro \
5355
--miniconda miniconda_version="4.3.31" \

0 commit comments

Comments
 (0)