From 1a7ea7e40a55957f0afb77eee98a55d779e8c05a Mon Sep 17 00:00:00 2001
From: Diego Ripley <diego@diegoripley.ca>
Date: Tue, 16 Sep 2025 18:18:55 +0000
Subject: [PATCH] Update GDAL, install some other Python packages, and change
 port for postgres

---
 .devcontainer/devcontainer.json | 6 +++---
 Dockerfile                      | 4 ++--
 docker-compose.yml              | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fdd871f..bfa9579 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,8 +6,8 @@
   "containerUser": "ubuntu",
   "shutdownAction": "stopCompose",
   "forwardPorts": [
-    5432,
-    8888
+    8888,
+    5435
   ],
   "customizations": {
     "vscode": {
@@ -26,4 +26,4 @@
   "mounts": [
 		"source=${localEnv:HOME}/.ssh,target=/home/ubuntu/.ssh,type=bind,consistency=cached"
 	]
-}
\ No newline at end of file
+}
diff --git a/Dockerfile b/Dockerfile
index 06abb90..370283d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-full-3.11.0
+FROM ghcr.io/osgeo/gdal:ubuntu-full-3.11.4
 
 # Ubuntu is UID 1000 and GID 1000
 ARG USERNAME=ubuntu
@@ -40,7 +40,7 @@ USER ${USERNAME}
 # Create virtual environment and install Python packages
 RUN uv venv ~/.venv \
     && cd ~ \
-    && uv pip install 'geopandas[all]' duckdb psycopg2-binary jupyterlab lonboard click stats-can openpyxl ordered-set buckaroo jenkspy 'polars[all]'
+    && uv pip install 'geopandas[all]' duckdb psycopg2-binary jupyterlab lonboard click stats-can openpyxl ordered-set buckaroo jenkspy 'polars[all]' folium-pmtiles
 
 # Bash Kernel
 RUN cd ~ \
diff --git a/docker-compose.yml b/docker-compose.yml
index feb5682..311cfb5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,17 +16,17 @@ services:
     command: sleep infinity
   db:
     image: postgis/postgis:17-3.5-alpine
-    container_name: db
+    container_name: devcontainer_postgres
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data
     env_file: .env
     ports:
-      - 5432:5432
+      - 5435:5432
 
 networks:
   default:
     name: dev-container
 
 volumes:
-  pgdata:
\ No newline at end of file
+  pgdata: