File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,14 +19,19 @@ COPY . /tmp/
1919RUN chown -R ${NB_USER}:${NB_USER} /tmp/conda-env && chmod -R 755 /tmp/conda-env
2020
2121# Update conda env sequentially to prevent hairy solve
22- RUN /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-core1.yml || (echo "install env-core1 failed" && exit 1)
23- RUN /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-core2.yml || (echo "install env-core2 failed" && exit 1)
24- RUN /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-geo.yml || (echo "install env-geo failed" && exit 1)
25- RUN /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-viz.yml || (echo "install env-viz failed" && exit 1)
26- RUN /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-qgis.yml || (echo "install env-qgis failed" && exit 1)
27- RUN /pyrocket_scripts/install-apt-packages.sh /tmp/apt.txt || (echo "install-apt-packages.sh failed" && exit 1)
28- RUN /pyrocket_scripts/install-desktop.sh /tmp/Desktop|| (echo "setup-desktop.sh failed" && exit 1)
22+ RUN set -eux; \
23+ /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-core1.yml; \
24+ /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-core2.yml; \
25+ /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-geo.yml; \
26+ /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-viz.yml; \
27+ /pyrocket_scripts/install-conda-packages.sh /tmp/conda-env/env-qgis.yml
2928
29+ RUN set -eux; \
30+ /pyrocket_scripts/install-apt-packages.sh /tmp/apt.txt
31+
32+ RUN set -eux; \
33+ /pyrocket_scripts/install-desktop.sh /tmp/Desktop
34+
3035USER root
3136# install the geospatial libraries and R spatial; the rocker script is copied into py-rocket-base as part of that image build
3237# need to ensure that it installs to the site-library (that user can control) and with a clean PATH
You can’t perform that action at this time.
0 commit comments