Merge pull request #384 from global-healthy-liveable-cities/update-pa…

…ckages-and-methods-for-2024

Update packages and methods for 2024

.ghsci_version

@@ -1 +1 @@
-4.4.8
+4.4.9

.test-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   ghsci:
-    image: globalhealthyliveablecities/global-indicators:v4.4.8
+    image: globalhealthyliveablecities/global-indicators:v4.4.9
     container_name: ghsci
     shm_size: 2g
     stdin_open: true # docker run -i

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   ghsci:
-    image: globalhealthyliveablecities/global-indicators:v4.4.8
+    image: globalhealthyliveablecities/global-indicators:v4.4.9
     container_name: ghsci
     shm_size: 2g
     stdin_open: true # docker run -i

docker/Dockerfile

@@ -1,4 +1,4 @@
-##############################################################################
+ ##############################################################################
 # Build an image from the dockerfile:
 # >>> docker build -t globalhealthyliveablecities/global-indicators:latest .
 #
@@ -18,7 +18,7 @@
 # >>> docker rmi $(docker images -q) --force
 ##############################################################################
 
-FROM continuumio/miniconda3:23.3.1-0-alpine as build
+FROM continuumio/miniconda3:latest as build
 LABEL maintainer="Global Healthy Liveable City Indicator Study Collaboration Group"
 LABEL url="https://github.com/global-healthy-liveable-cities/global-indicators"
 
@@ -39,7 +39,7 @@ RUN conda config --set show_channel_urls true && \
 
 # =============================================================================
 # Runtime environment
-FROM debian:bullseye-slim as runtime
+FROM debian:stable-slim as runtime
 
 # Install the environment pack
 COPY --from=build /env.tar.gz .

docker/docker-build.bat

@@ -5,12 +5,17 @@ echo.
 set "DOCKERUSER=globalhealthyliveablecities"
 set "PACKAGE=global-indicators"
 for /f "usebackq" %%x in ("%CD%\..\.ghsci_version") do set VERSION=%%x
+echo %PACKAGE% version %VERSION%
 :: login and remove any existing containers or images
 docker login
 
-:: build the image and export the conda env to yml
+:: build test image and export the conda env to yml
 docker build -t %DOCKERUSER%/%PACKAGE% .
-docker run --rm -it --shm-size=2g --net=host -v "%CD%":/home/ghsci globalhealthyliveablecities/global-indicators /bin/bash -c "pip list --format=freeze > ./requirements.txt"
+docker run --rm -it --net=host -v "%CD%":/home/ghsci %DOCKERUSER%/%PACKAGE% /bin/bash -c "pip list --format=freeze > ./requirements.txt"
+
+:: built multi-platform image
+docker buildx create --use
+docker buildx build --platform=linux/amd64,linux/arm64 -t %DOCKERUSER%/%PACKAGE%:v%VERSION% .
 
 :: get the package version, tag the image with it, then push to hub
 echo %PACKAGE% version %VERSION%

docker/environment.yml

@@ -3,16 +3,21 @@ channels:
   - conda-forge
 dependencies:
   - python
-  - osmnx=1.5.* # for constructing network graph from OpenStreetMap using Overpass API
+  - osmnx=1.5.*
+  - pandas=2.1.*
   - fpdf2=2.7.*
   - sqlalchemy=1.4.*
-  - nicegui>=1.2.24
-  - cryptography>=41.0.2
+  - nicegui=1.4.13
+  - cryptography=42.0.2
   - requests=2.31.*
-  - tornado>=6.3.2
-  - starlette>=0.27.0
-  - pyrosm # for building network graphs from OpenStreetMap .pbf files
-  - momepy # for building network graphs from external network files
+  - tornado>=6.3.3
+  - fonttools=4.43.0
+  - jupyterlab=4.0.12
+  - jupyter-lsp=2.2.2
+  - urllib3=2.0.7
+  - pillow=10.2.0
+  - pip>=24.*
+  - pyrosm=0.6.2
   - openpyxl
   - babel
   - cartopy
@@ -27,4 +32,3 @@ dependencies:
   - tqdm
   - pyyaml
   - websockets
-  - pip