Skip to content

Commit 0694390

Browse files
committed
Add better detection of Renviron.site
1 parent 9f8d8a3 commit 0694390

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ ENV BIOCONDUCTOR_USE_CONTAINER_REPOSITORY=FALSE
3535
# Add libsbml CFLAGS
3636
ADD bioc_scripts/install_bioc_sysdeps.sh /tmp/
3737
RUN bash /tmp/install_bioc_sysdeps.sh $BIOCONDUCTOR_VERSION \
38-
&& echo "R_LIBS=/usr/local/lib/R/host-site-library:\${R_LIBS}" > /usr/local/lib/R/etc/Renviron.site \
38+
&& export R_ENVIRON_SITE=$([ -d /usr/local/lib/R/etc ] && echo /usr/local/lib/R/etc/Renviron.site || ([ -d /usr/lib/R/etc ] && echo /usr/lib/R/etc/Renviron.site || (mkdir -p /usr/local/lib/R/etc && echo /usr/local/lib/R/etc/Renviron.site))) \
39+
&& echo "R_LIBS=/usr/local/lib/R/host-site-library:\${R_LIBS}" > $R_ENVIRON_SITE \
3940
&& curl -OL http://bioconductor.org/checkResults/devel/bioc-LATEST/Renviron.bioc \
4041
&& sed -i '/^IS_BIOC_BUILD_MACHINE/d' Renviron.bioc \
4142
&& cat Renviron.bioc | grep -o '^[^#]*' | sed 's/export //g' >>/etc/environment \
42-
&& cat Renviron.bioc >> /usr/local/lib/R/etc/Renviron.site \
43-
&& echo BIOCONDUCTOR_VERSION=${BIOCONDUCTOR_VERSION} >> /usr/local/lib/R/etc/Renviron.site \
44-
&& echo BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_DOCKER_VERSION} >> /usr/local/lib/R/etc/Renviron.site \
45-
&& echo 'LIBSBML_CFLAGS="-I/usr/include"' >> /usr/local/lib/R/etc/Renviron.site \
46-
&& echo 'LIBSBML_LIBS="-lsbml"' >> /usr/local/lib/R/etc/Renviron.site \
43+
&& cat Renviron.bioc >> $R_ENVIRON_SITE \
44+
&& echo BIOCONDUCTOR_VERSION=${BIOCONDUCTOR_VERSION} >> $R_ENVIRON_SITE \
45+
&& echo BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_DOCKER_VERSION} >> $R_ENVIRON_SITE \
46+
&& echo 'LIBSBML_CFLAGS="-I/usr/include"' >> $R_ENVIRON_SITE \
47+
&& echo 'LIBSBML_LIBS="-lsbml"' >> $R_ENVIRON_SITE \
4748
&& rm -rf Renviron.bioc
4849

4950
ARG TARGETARCH

0 commit comments

Comments
 (0)