Skip to content

Commit 26c50e5

Browse files
authored
hotfix on path order (#758)
some scripts put `/opt/venv/bin` at the end of path, should be at the start (to take precedence over the base python which shouldn't be used for pip installs etc).
2 parents 31b9272 + 4a8ff1d commit 26c50e5

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

dockerfiles/cuda_4.3.1.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV PYTHON_CONFIGURE_OPTS=--enable-shared
1313
ENV RETICULATE_AUTOCONFIGURE=0
1414
ENV PURGE_BUILDDEPS=false
1515
ENV VIRTUAL_ENV=/opt/venv
16-
ENV PATH=${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin
16+
ENV PATH=${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin
1717

1818
COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh
1919

dockerfiles/cuda_4.3.2.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV PYTHON_CONFIGURE_OPTS=--enable-shared
1313
ENV RETICULATE_AUTOCONFIGURE=0
1414
ENV PURGE_BUILDDEPS=false
1515
ENV VIRTUAL_ENV=/opt/venv
16-
ENV PATH=${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin
16+
ENV PATH=${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin
1717

1818
COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh
1919

dockerfiles/cuda_devel.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV PYTHON_CONFIGURE_OPTS=--enable-shared
1313
ENV RETICULATE_AUTOCONFIGURE=0
1414
ENV PURGE_BUILDDEPS=false
1515
ENV VIRTUAL_ENV=/opt/venv
16-
ENV PATH=${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin
16+
ENV PATH=${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin
1717

1818
COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh
1919

stacks/4.3.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
"RETICULATE_AUTOCONFIGURE": "0",
206206
"PURGE_BUILDDEPS": "false",
207207
"VIRTUAL_ENV": "/opt/venv",
208-
"PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin"
208+
"PATH": "${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin"
209209
},
210210
"COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh",
211211
"RUN_a_script": "/rocker_scripts/install_R_source.sh",

stacks/4.3.2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
"RETICULATE_AUTOCONFIGURE": "0",
260260
"PURGE_BUILDDEPS": "false",
261261
"VIRTUAL_ENV": "/opt/venv",
262-
"PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin"
262+
"PATH": "${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin"
263263
},
264264
"COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh",
265265
"RUN_a_script": "/rocker_scripts/install_R_source.sh",

stacks/devel.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
"RETICULATE_AUTOCONFIGURE": "0",
159159
"PURGE_BUILDDEPS": "false",
160160
"VIRTUAL_ENV": "/opt/venv",
161-
"PATH": "${PATH}:${VIRTUAL_ENV}/bin:${CUDA_HOME}/bin"
161+
"PATH": "${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin"
162162
},
163163
"COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh",
164164
"RUN_a_script": "/rocker_scripts/install_R_source.sh",

0 commit comments

Comments
 (0)