Updating dockerfile and environment.yml with versions

earthlab · Sep 13, 2023 · ad6a94c · ad6a94c
1 parent 1611f62
commit ad6a94c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM continuumio/miniconda3:4.6.14
+FROM continuumio/miniconda3:22.11.1
 
 ENV PYTHONDONTWRITEBYTECODE=true
 
@@ -9,7 +9,8 @@ WORKDIR /home/firedpy
 RUN conda update conda --yes \
     && conda config --add channels conda-forge \
     && conda config --set channel_priority strict \
-    && conda env create -f environment.yaml 
+    && conda env create -f environment.yaml \ 
+    && echo "conda activate firedpy" >> ~/.bashrc
 
 RUN conda clean --all --yes --force-pkgs-dirs \
     && find /opt/conda/ -follow -type f -name '*.a' -delete \
@@ -18,15 +19,23 @@ RUN conda clean --all --yes --force-pkgs-dirs \
     && conda list
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    awscli \
-    htop 
-
+    && apt-get install -y htop curl unzip
+
+# Download AWS CLI v2 and install it
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
+    && unzip awscliv2.zip \
+    && ./aws/install
+
+# Clean up the downloaded files and temporary packages
+RUN rm -rf awscliv2.zip ./aws \
+    && apt-get remove -y curl unzip \
+    && apt-get clean
+
 # The following line of code solved a problem that apparently is now not happening, and now this creates its own problem.
 # If one is trying to do a docker build, and gets an error involving libffi.so.7, uncomment the following lines.
 # RUN ln -s /opt/conda/envs/firedpy/lib/libffi.so.6 /opt/conda/envs/firedpy/lib/libffi.so.7 \
 #  && pip install ipython
 
 SHELL ["conda", "run", "-n", "firedpy", "/bin/bash", "-c"]
 
-RUN python setup.py install 
+RUN python setup.py install  
diff --git a/environment.yaml b/environment.yaml
@@ -2,23 +2,23 @@ name: firedpy
 channels:
   - defaults
 dependencies:
-  - beautifulsoup4
-  - dask
-  - descartes
-  - gdal
-  - geopandas
-  - fiona
-  - lxml
-  - matplotlib
-  - netcdf4
-  - numpy
-  - pandas
-  - pycurl
-  - pyyaml
-  - rasterio
-  - requests
-  - toolz
-  - tqdm
-  - xarray
-  - paramiko
-  - pytest-shutil
+  - beautifulsoup4=4.11.1
+  - dask=2022.7.0
+  - descartes=1.1.0
+  - gdal=3.0.2
+  - geopandas=0.9.0
+  - fiona=1.8.13.post1
+  - lxml=4.9.1
+  - matplotlib=3.5.2
+  - netcdf4=1.5.7
+  - numpy=1.23.1
+  - pandas=1.4.3
+  - pycurl=7.45.1
+  - pyyaml=6.0
+  - rasterio=1.2.10
+  - requests=2.28.1
+  - toolz=0.11.2
+  - tqdm=4.64.0
+  - xarray=0.20.1
+  - paramiko=2.8.1
+  - pytest-shutil=1.7.0