diff --git a/Dockerfile b/Dockerfile index 6a58d18b6627157d8d6fbf7151bebcd8381c4a5e..0a80e13cdbe3186ecee13ffce9c7ce93f6285171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,12 +106,11 @@ RUN mkdir -p ${BUILD} ${OPT}/netcdf4 && cd ${BUILD} && \ RUN echo 'alias ls="ls --color=auto"' >> ~/.bashrc && \ echo 'alias ll="ls -lGh $@"' >> ~/.bashrc -RUN echo "export HDF4=${OPT}/hdf4" >> ~/.bashrc && \ - echo "export HDF5=${OPT}/hdf5" >> ~/.bashrc && \ - echo "export NETCDF=${OPT}/netcdf4" >> ~/.bashrc && \ - echo "export LD_LIBRARY_PATH=${HDF4}/lib:${HDF5}/lib:${NETCDF}/lib:${LD_LIBRARY_PATH}" >> ~/.bashrc && \ - echo "" >> ~/.bashrc - -RUN echo "export PATH=${HDF4}/bin/:${HDF5}/bin:${NETCDF}/bin:${PATH}" >> ~/.bashrc && \ - echo "" >> ~/.bashrc +# set these so future shells pick them up too +ENV HDF4 ${OPT}/hdf4 +ENV HDF5 ${OPT}/hdf5 +ENV NETCDF ${OPT}/netcdf4 +ENV LD_LIBRARY_PATH ${HDF4}/lib:${HDF5}/lib:${NETCDF}/lib:${LD_LIBRARY_PATH} + +ENV PATH ${HDF4}/bin/:${HDF5}/bin:${NETCDF}/bin:${PATH}