Skip to content

Commit

Permalink
Docker installation updates (#246)
Browse files Browse the repository at this point in the history
* Fix PSD number

* Update dockerfile installs for new dolphin, spurt, opera-utils

* Remove atmosphere (no troposphere correction) and cxx compiler

* Update specfile
  • Loading branch information
scottstanie authored Jan 16, 2025
1 parent 2e3f974 commit a121b68
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 229 deletions.
8 changes: 4 additions & 4 deletions conda-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ dependencies:
- yamale
# Corrections
- pysolid # For solid earth tide corrections
- pyaps3
- xarray
# - pyaps3
# - xarray
# Unwrappers:
- snaphu>=0.4.0
- snaphu>=0.4.1
- isce3-cpu>=0.16.0
- tophu
- cxx-compiler # for whirlwind
# - cxx-compiler # for whirlwind
# # Spurt is not yet on pip/conda, but only has one extra (...which also is badly supported on conda-forge)
# - ortools==9.8.3296
- dolphin>=0.35.0
Expand Down
8 changes: 3 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,10 @@ RUN micromamba install --yes --channel conda-forge -n base -f /tmp/specfile.txt
# Activate, otherwise python will not be found
# https://github.com/mamba-org/micromamba-docker#running-commands-in-dockerfile-within-the-conda-environment
ARG MAMBA_DOCKERFILE_ACTIVATE=1
# Install whirlwind from source
RUN pip install git+https://github.com/isce-framework/whirlwind@40defb38d2d6deca2819934788ebbc57e418e32d
RUN pip install git+https://github.com/isce-framework/spurt@22b971e0937d379be24c615d7b3931f3a7802a93 # 2024-11-25
RUN pip install git+https://github.com/isce-framework/spurt@v0.1.0
# --no-deps because they are installed with conda
RUN pip install --no-deps git+https://github.com/opera-adt/opera-utils@v0.14.0
RUN pip install --no-deps git+https://github.com/isce-framework/dolphin@v0.34.2
RUN pip install --no-deps git+https://github.com/opera-adt/opera-utils@v0.15.0
RUN pip install --no-deps git+https://github.com/isce-framework/dolphin@v0.35.1

COPY --chown=$MAMBA_USER:$MAMBA_USER . .
RUN python -m pip install --no-deps .
Expand Down
Loading

0 comments on commit a121b68

Please sign in to comment.