Skip to content

Commit df478aa

Browse files
committed
Add better detection of Renviron.site
1 parent 6c142be commit df478aa

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
@@ -38,15 +38,16 @@ USER root
3838
# Add libsbml CFLAGS
3939
ADD bioc_scripts/install_bioc_sysdeps.sh /tmp/
4040
RUN bash /tmp/install_bioc_sysdeps.sh $BIOCONDUCTOR_VERSION \
41-
&& echo "R_LIBS=/usr/local/lib/R/host-site-library:\${R_LIBS}" > /usr/local/lib/R/etc/Renviron.site \
41+
&& 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))) \
42+
&& echo "R_LIBS=/usr/local/lib/R/host-site-library:\${R_LIBS}" > $R_ENVIRON_SITE \
4243
&& curl -OL http://bioconductor.org/checkResults/devel/bioc-LATEST/Renviron.bioc \
4344
&& sed -i '/^IS_BIOC_BUILD_MACHINE/d' Renviron.bioc \
4445
&& cat Renviron.bioc | grep -o '^[^#]*' | sed 's/export //g' >>/etc/environment \
45-
&& cat Renviron.bioc >> /usr/local/lib/R/etc/Renviron.site \
46-
&& echo BIOCONDUCTOR_VERSION=${BIOCONDUCTOR_VERSION} >> /usr/local/lib/R/etc/Renviron.site \
47-
&& echo BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_DOCKER_VERSION} >> /usr/local/lib/R/etc/Renviron.site \
48-
&& echo 'LIBSBML_CFLAGS="-I/usr/include"' >> /usr/local/lib/R/etc/Renviron.site \
49-
&& echo 'LIBSBML_LIBS="-lsbml"' >> /usr/local/lib/R/etc/Renviron.site \
46+
&& cat Renviron.bioc >> $R_ENVIRON_SITE \
47+
&& echo BIOCONDUCTOR_VERSION=${BIOCONDUCTOR_VERSION} >> $R_ENVIRON_SITE \
48+
&& echo BIOCONDUCTOR_DOCKER_VERSION=${BIOCONDUCTOR_DOCKER_VERSION} >> $R_ENVIRON_SITE \
49+
&& echo 'LIBSBML_CFLAGS="-I/usr/include"' >> $R_ENVIRON_SITE \
50+
&& echo 'LIBSBML_LIBS="-lsbml"' >> $R_ENVIRON_SITE \
5051
&& rm -rf Renviron.bioc
5152

5253
ARG TARGETARCH

0 commit comments

Comments
 (0)