Преглед на файлове

refactor: merge `apt-get install` layers

Fabian Peter Hammerle преди 4 години
родител
ревизия
567a1d7113
променени са 1 файла, в които са добавени 21 реда и са изтрити 34 реда
  1. 21 34
      Dockerfile

+ 21 - 34
Dockerfile

@@ -2,8 +2,29 @@ FROM debian:bullseye
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
+        curl \
         jupyter-notebook \
+        python3-distutils `# pyproj` \
+        python3-geopandas \
+        python3-xlrd \
         r-cran-irkernel \
+        unzip \
+        `# https://github.com/ResidentMario/geoplot/blob/master/setup.py` \
+        python3-cartopy \
+        python3-descartes \
+        python3-matplotlib \
+        python3-pip \
+        python3-seaborn \
+        python3-setuptools \
+        python3-wheel \
+        `# mapclassify->geoplot` \
+        python3-deprecated \
+        `# contextily->geoplot` \
+        python3-geopy \
+        python3-joblib \
+        python3-pillow \
+        python3-rasterio \
+        python3-requests \
         `# https://github.com/rOpenGov/eurostat/blob/master/DESCRIPTION` \
         r-cran-broom \
         r-cran-classint \
@@ -23,40 +44,6 @@ RUN apt-get update \
         r-cran-lubridate \
         r-cran-xml2
 
-# TODO merge
-RUN apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        curl \
-        python3-geopandas \
-        python3-xlrd \
-        unzip
-RUN apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        python3-distutils `# pyproj`
-RUN apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        `# https://github.com/ResidentMario/geoplot/blob/master/setup.py` \
-        python3-cartopy \
-        python3-descartes \
-        python3-matplotlib \
-        python3-pip \
-        python3-seaborn \
-        python3-setuptools
-RUN apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        `# https://github.com/ResidentMario/geoplot/blob/master/setup.py` \
-        python3-wheel
-RUN apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        `# mapclassify->geoplot` \
-        python3-deprecated \
-        `# contextily->geoplot` \
-        python3-geopy \
-        python3-joblib \
-        python3-pillow \
-        python3-rasterio \
-        python3-requests
-
 RUN chgrp staff /usr/local/bin `# meranctile` \
     && chmod g+ws /usr/local/bin \
     && useradd --create-home --groups staff notebook