#124 #126 upgrade/rebuild Dockerfile - pin packages to solve #126

geopython · Jun 5, 2023 · 91f5686 · 91f5686
1 parent ea20b3a
commit 91f5686
Show file tree

Hide file tree

Showing 3 changed files with 2,147 additions and 2,135 deletions.
diff --git a/workshop/jupyter/Dockerfile b/workshop/jupyter/Dockerfile
@@ -27,7 +27,7 @@
 #
 # =================================================================
 
-FROM ubuntu:22.04
+FROM ubuntu:jammy
 
 LABEL maintainer="Just van den Broecke <justb4@gmail.com>"
 
@@ -42,8 +42,7 @@ ENV TZ=${TZ} \
 	LANG=${LANG} \
 	DEBIAN_FRONTEND="noninteractive" \
 	DEB_BUILD_DEPS="gpg-agent software-properties-common build-essential apt-utils python3-dev libproj-dev" \
-	DEB_PACKAGES="locales locales-all proj-bin python3-shapely python3-pyproj python3-setuptools python3-pip python3-gdal python3-fiona python3-rasterio python3-pyproj ${ADD_DEB_PACKAGES}" \
-	PIP_PACKAGES="jupyter ${ADD_PIP_PACKAGES}" \
+	DEB_PACKAGES="locales locales-all proj-bin python3-shapely python3-pyproj python3-setuptools python3-pip python3-gdal python3-fiona python3-rasterio ${ADD_DEB_PACKAGES}" \
 	PROJ_DIR="/usr"
 
 COPY ./requirements.txt /jupyter/requirements.txt
@@ -58,8 +57,8 @@ RUN \
     && apt-get --no-install-recommends install -y ${DEB_PACKAGES} \
     && update-locale LANG=${LANG} \
     && echo "For ${TZ} date=$(date)" && echo "Locale=$(locale)" \
-	&& pip3 install ${PIP_PACKAGES} \
 	&& pip3 install -r /jupyter/requirements.txt \
+	&& if [ ${ADD_PIP_PACKAGES} != "" ] ; then pip3 install ${ADD_PIP_PACKAGES}; fi \
 	&& apt-get remove --purge ${DEB_BUILD_DEPS} -y \
 	&& apt autoremove -y  \
 	&& rm -rf /var/lib/apt/lists/*