From 88d75210ca63fe341804777eaebb3570732d4420 Mon Sep 17 00:00:00 2001 From: Paula Olaya Date: Tue, 27 Feb 2024 15:38:06 -0500 Subject: [PATCH] [update] dockerfile env --- .github/workflows/main.yml | 2 +- Dockerfile | 22 +++++++++++----------- environment.yml | 10 ---------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96a6dc8..61b92e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: docker buildx create --use docker buildx build \ --file ./Dockerfile \ - --tag ${{ secrets.DOCKERHUB_ORG }}/somospie_openvisus:latest \ + --tag ${{ secrets.DOCKERHUB_ORG }}/somospie_openvisus:tutorial \ --push . env: diff --git a/Dockerfile b/Dockerfile index 4a7e723..a00acc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,14 @@ FROM --platform=linux/amd64 continuumio/miniconda3:23.10.0-1 RUN mkdir app WORKDIR /app -COPY files/ /app/files -COPY idx_data/ /app/idx_data -COPY openvisuspy/ /app/openvisuspy -COPY GEOtiled/ /app/GEOTiled -COPY Tutorial.ipynb /app -COPY Explore_Data.ipynb /app +COPY files/ /app/files/ +COPY idx_data/ /app/idx_data/ +COPY openvisuspy/ /app/openvisuspy/ +COPY GEOtiled/geotiled /app/geotiled/ +COPY Tutorial.ipynb /app/ +COPY Explore_Data.ipynb /app/ COPY *.py /app/ -COPY environment.yml /app +COPY environment.yml /app/ # Install base utilities RUN apt-get update \ @@ -25,9 +25,9 @@ RUN apt-get update \ # /bin/bash ~/miniconda.sh -b -p /opt/conda # Put conda in path so we can use conda activate -# ENV PATH=$CONDA_DIR/bin:$PATH -# -RUN conda update -n base conda && conda install -n base conda-libmamba-solver && conda config --set solver libmamba +#ENV PATH=$CONDA_DIR/bin:$PATH + +#RUN conda update -n base conda && conda install -n base conda-libmamba-solver && conda config --set solver libmamba WORKDIR /app @@ -36,7 +36,7 @@ SHELL ["conda", "run", "-n", "somospie", "/bin/bash", "-c"] RUN pip install openvisus -WORKDIR /app/GEOtiled/geotiled +WORKDIR /app/geotiled/ RUN pip install -e . WORKDIR /app/openvisuspy diff --git a/environment.yml b/environment.yml index f0be5d2..14532d3 100644 --- a/environment.yml +++ b/environment.yml @@ -7,23 +7,13 @@ dependencies: - gdal - ipykernel==6.29.2 - ipywidgets==8.1.2 - - matplotlib==3.8.2 - - ipywidgets-bokeh==1.5.0 - - pandas - - pyspark - - findspark - - scikit-learn - - matplotlib - xmltodict - requests - colorcet - - geopandas - - tqdm - jupyterlab - tifffile - rasterio - imagecodecs - - numpy - boto3 - param==2.0.2 - bokeh==3.3.4