Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1pt] PR: Upgrade base Docker image to GDAL v3.8.0 #1058

Merged
merged 32 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7b693a8
Copy add_and_verify_crosswalk.py from dev-address-crosswalk-issues
mluck Sep 21, 2023
2c8588b
Compute comparisons
mluck Sep 22, 2023
495fdc3
Merge branch 'dev' into dev-verify-crosswalk
mluck Oct 11, 2023
a0f30f7
isort tools/verify_crosswalk.py
mluck Oct 12, 2023
e7797b1
Debug verify_crosswalk
mluck Oct 12, 2023
b8d8ba5
Minor edits
mluck Oct 12, 2023
0ab05ad
Count segment intersections
mluck Oct 16, 2023
d8ac9b0
Minor edits
mluck Oct 16, 2023
e81bebf
Merge branch 'dev' into dev-verify-crosswalk
mluck Oct 18, 2023
e171c8f
isort
mluck Oct 18, 2023
2964b97
Reformat
mluck Oct 26, 2023
c019fc1
Ignore multiple feature_ids
mluck Oct 27, 2023
b604512
Merge branch 'dev' into dev-verify-crosswalk
mluck Oct 27, 2023
838bd7d
Update documentation
mluck Oct 30, 2023
afda6e0
pyflwdir
mluck Dec 22, 2023
c49e4d7
threshold accumulations
mluck Dec 22, 2023
618f9bc
remove taudem threshold
mluck Dec 22, 2023
c0b9d5e
Update CHANGELOG.md
mluck Dec 22, 2023
7064725
Combine intersections and network
mluck Jan 3, 2024
772c221
Merge branch 'dev' into dev-verify-crosswalk
mluck Jan 3, 2024
3637f5a
Add switch to run tool in fim_pipeline
mluck Jan 5, 2024
1db7855
Delete unnecessary file
mluck Jan 5, 2024
7c1df16
Rename file
mluck Jan 5, 2024
7c05183
Bump pycryptodomex from 3.19.0 to 3.19.1
dependabot[bot] Jan 5, 2024
c26df17
Create output file
mluck Jan 5, 2024
03d40b2
Merge branch 'dev' into dev-verify-crosswalk
mluck Jan 5, 2024
acb4ef5
Update CHANGELOG.md
mluck Jan 5, 2024
9d64a11
Merge 'origin/dependabot/pip/pycryptodomex-3.19.1' into dev-gdal-3.8.…
Jan 10, 2024
41080f8
fix changelog from merge to pycryptodomex
Jan 10, 2024
982a835
Merge remote-tracking branch 'origin/dev-verify-crosswalk' into dev-g…
Jan 10, 2024
c312863
Add fix for dependabot jinja update
Jan 12, 2024
c75b6f6
Merge branch 'dev' into dev-gdal-3.8.0-pyflwdir
CarsonPruitt-NOAA Jan 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Temporary image to build the libraries and only save the needed artifacts
FROM ghcr.io/osgeo/gdal:ubuntu-full-3.4.3 AS builder
FROM ghcr.io/osgeo/gdal:ubuntu-full-3.8.0 AS builder
WORKDIR /opt/builder
ARG dataDir=/data
ARG projectDir=/foss_fim
Expand All @@ -15,7 +15,7 @@ RUN git clone https://github.com/dtarb/taudem.git
RUN git clone https://github.com/fernandoa123/cybergis-toolkit.git taudem_accelerated_flowDirections

RUN apt-get update --fix-missing && apt-get install -y cmake mpich \
libgtest-dev libboost-test-dev libnetcdf-dev openjdk-17-jdk && rm -rf /var/lib/apt/lists/*
libgtest-dev libboost-test-dev libnetcdf-dev && rm -rf /var/lib/apt/lists/*

## Compile Main taudem repo ##
RUN mkdir -p taudem/bin
Expand All @@ -36,18 +36,13 @@ RUN mkdir -p $taudemDir
RUN mkdir -p $taudemDir2

## Move needed binaries to the next stage of the image
RUN cd taudem/bin && mv -t $taudemDir flowdircond aread8 threshold streamnet gagewatershed catchhydrogeo dinfdistdown
RUN cd taudem/bin && mv -t $taudemDir flowdircond streamnet gagewatershed catchhydrogeo dinfdistdown
RUN cd taudem_accelerated_flowDirections/taudem/build/bin && mv -t $taudemDir2 d8flowdir dinfflowdir




###############################################################################################



# Base Image that has GDAL, PROJ, etc
FROM ghcr.io/osgeo/gdal:ubuntu-full-3.4.3
FROM ghcr.io/osgeo/gdal:ubuntu-full-3.8.0
ARG dataDir=/data
ENV projectDir=/foss_fim
ARG depDir=/dependencies
Expand All @@ -72,7 +67,7 @@ RUN mkdir -p $depDir
COPY --from=builder $depDir $depDir

RUN apt update --fix-missing
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y p7zip-full python3-pip time mpich=3.3.2-2build1 parallel=20161222-1.1 libgeos-dev=3.8.0-1build1 expect=5.45.4-2build1 tmux rsync tzdata openjdk-17-jdk
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y p7zip-full python3-pip time mpich parallel libgeos-dev expect tmux rsync tzdata

RUN apt auto-remove

Expand Down Expand Up @@ -107,7 +102,7 @@ RUN pip3 install pipenv==2022.4.8 && PIP_NO_CACHE_DIR=off pipenv install --syste
# We download and unzip it to the same file folder that pip deployed the whitebox library.
# Whitebox also attempts to always download a folder called testdata regardless of use.
# We added an empty folder to fake out whitebox_tools.py so it doesn't try to download the folder
RUN wbox_path=/usr/local/lib/python3.8/dist-packages/whitebox/ && \
RUN wbox_path=/usr/local/lib/python3.10/dist-packages/whitebox/ && \
wget -P $wbox_path https://www.whiteboxgeo.com/WBT_Linux/WhiteboxTools_linux_musl.zip && \
unzip -o $wbox_path/WhiteboxTools_linux_musl.zip -d $wbox_path && \
cp $wbox_path/WBT/whitebox_tools $wbox_path && \
Expand Down
3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ flake8-pyproject = "==1.2.3"
pre-commit = "==3.3.3"
isort = "==5.12.0"
urllib3 = "==1.26.18"
pyflwdir = "*"

[requires]
python_version = "3.8"
python_version = "3.10"
Loading