Update Docker.modis-vcf

nasa-nccs-hpda · Dec 17, 2024 · e33d60b · e33d60b
1 parent 4620300
commit e33d60b
Showing 1 changed file with 54 additions and 26 deletions.
diff --git a/docker/applications/modis-vcf/Docker.modis-vcf b/docker/applications/modis-vcf/Docker.modis-vcf
@@ -1,8 +1,8 @@
-#FROM gtamkin/ilab-base-gdal-3.3.3-v2:latest
-#FROM docker://nasanccs/ilab-base:latest
-#FROM ghcr.io/osgeo/gdal:ubuntu-full-3.9.2
-#FROM docker://rapidsai/rapidsai-cloud-ml:22.10-cuda11.2-base-ubuntu20.04-py3.9
-FROM nvcr.io/nvidia/rapidsai/base:24.10-cuda12.5-py3.10
+ARG VERSION_DATE=24.10
+ARG CUDA_VERSION=12.5
+ARG PYTHON_VERSION=3.10
+ARG FROM_IMAGE=nvcr.io/nvidia/rapidsai/base
+FROM ${FROM_IMAGE}:${VERSION_DATE}-cuda${CUDA_VERSION}-py${PYTHON_VERSION}
 
 #-------------------------------------------------------------------------------
 # - 1/12/23  modis-vcf 1.0.0 -initial container built with pyarrow
@@ -11,30 +11,61 @@ FROM nvcr.io/nvidia/rapidsai/base:24.10-cuda12.5-py3.10
 # - 11/13/24 modis-vcf 2.0 -Converting to Docker build format
 #-------------------------------------------------------------------------------
 
-# ENV PYTHONPATH="$PYTHONPATH:/usr/local/ilab"
+
 # Ubuntu needs noninteractive to be forced
-ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBIAN_FRONTEND noninteractive
 ENV CPLUS_INCLUDE_PATH="/usr/include/gdal"
 ENV C_INCLUDE_PATH="/usr/include/gdal"
 ENV PROJ_LIB="/usr/share/proj"
 ENV PROJ_DATA="/usr/share/proj"
-# ENV PYTHONPATH="$PYTHONPATH:/usr/local/ilab"
-# ENV PYTHONPATH="$PYTHONPATH:/usr/local/ilab/modis_vcf"
+
 #-------------------------------------------------------------------------------
 # System Dependencies
 #-------------------------------------------------------------------------------
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        python3-pip python3-dev wget vim curl git procps gcc g++ bzip2 libssl-dev \
-        libsqlite3-dev libx11-dev libgeos++-dev libproj-dev \
-        build-essential parallel libdatetime-perl gawk util-linux bc \
-        python3-tk tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev \
-        zlib1g-dev liblzma-dev libgirepository1.0-dev libcairo2-dev \
-        pkg-config gir1.2-gtk-3.0 libnetcdf-dev libhdf4-dev 2to3 && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /var/cache/apt
+    apt-get -y install software-properties-common && \
+    add-apt-repository ppa:ubuntugis/ubuntugis-unstable && \
+    curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
+    apt-get update && apt-get -y dist-upgrade && \
+    apt-get -y install build-essential \
+        libsm6 \
+        libxext6 \
+        libxrender-dev \
+        libfontconfig1 \
+        bzip2 \
+        diffutils \
+        file \
+        build-essential \
+        make \
+        swig \
+        libnetcdf-dev \
+        libacl1-dev \
+        libgeos++-dev \
+        libgeos-dev \
+        libsqlite3-dev \
+        libx11-dev \
+        libproj-dev \
+        proj-data \
+        proj-bin \
+        libspatialindex-dev \
+        wget \
+        vim \
+        curl \
+        git \
+        procps \
+        gcc \
+        g++ \
+        bzip2 \
+        libssl-dev \
+        libzmq3-dev \
+        libpng-dev \
+        libfreetype6-dev \ 
+        locales \
+        git-lfs && \
+    apt-get -y install gdal-bin libgdal-dev && \
+    apt-get -y autoremove && \
+    rm -rf /var/cache/apt /var/lib/apt/lists/*
+
 #-------------------------------------------------------------------------------
 # Tools 
 # 1/12/23 - added installation of 2to3 python conversion tool
@@ -55,11 +86,11 @@ RUN git clone --single-branch --branch master https://github.com/pkolano/shift.g
     export LANG=en_US.UTF-8 && \
     locale-gen en_US.UTF-8 && \
     rm -rf /app
+
 # Pip
 RUN pip install \
     numpy \
     certifi \
-    xarray \
     pandas \
     h5py \
     pyhdf \
@@ -73,14 +104,11 @@ RUN pip install \
     coveralls \
     rtree \
     GDAL==`ogrinfo --version | grep -Eo '[0-9]\.[0-9]\.[0-9]+'`
+
 #-------------------------------------------------------------------------------
 # modis-vcf Git Dependencies
 #-------------------------------------------------------------------------------
-# RUN mkdir -p "/usr/local/ilab" && \
-#     git clone --single-branch --branch main https://github.com/nasa-nccs-hpda/core.git \
-#         /usr/local/ilab/core && \
-#     git clone --single-branch --branch main https://github.com/nasa-nccs-hpda/modis_vcf.git \
-#         /usr/local/ilab/modis_vcf
+
 HEALTHCHECK NONE
 ENTRYPOINT []
 CMD ["/bin/bash"]