From 7a0d36fdb38fc364035cb0846f94885ce5a56cdb Mon Sep 17 00:00:00 2001
From: David Larlet <david@larlet.fr>
Date: Fri, 2 Aug 2024 11:36:16 -0400
Subject: [PATCH] chore: use latest Docker keyword for docker-compose

---
 Makefile           |  4 ++--
 docker-compose.yml | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c84fc1ea..d0b4ec82 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,8 @@ minor: ## Bump the current version to a new minor one
 docker: ## Create a new Docker image and publish it
 	$(eval VERSION=$(shell hatch version))
 	@echo "Version to build: ${VERSION}"
-	docker build -t umap/umap:${VERSION} .
-	docker push umap/umap:${VERSION}
+	docker build -t umap/umap:${VERSION} -t umap/umap:latest .
+	docker push --all-tags umap/umap:${VERSION}
 
 .PHONY: build
 build: ## Build the Python package before release
diff --git a/docker-compose.yml b/docker-compose.yml
index e77ad38d..24cb0bc2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     healthcheck:
         test: ["CMD-SHELL", "pg_isready -U postgres"]
         interval: 2s
+    # check https://hub.docker.com/r/postgis/postgis to see available versions
     image: postgis/postgis:14-3.3-alpine
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
@@ -16,18 +17,25 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    image: umap/umap:2.0.2
+    image: umap/umap:latest
     ports:
-      - "${PORT-8000}:8000"
+      # modify the external port (8001, on the left) if desired, but make sure it matches SITE_URL, below
+      - "8001:8000"
     environment:
       - DATABASE_URL=postgis://postgres@db/postgres
       - SECRET_KEY=some-long-and-weirdly-unrandom-secret-key
-      - SITE_URL=https://umap.local/
+      - SITE_URL=https://localhost:8001/
       - UMAP_ALLOW_ANONYMOUS=True
       - DEBUG=1
+      - STATIC_ROOT=/srv/umap/static
+      - MEDIA_ROOT=/srv/umap/uploads
     volumes:
-      - data:/srv/umap/uploads
+      - umap_userdata:/srv/umap/uploads
+      # FIX the path on the left, below, to your location
+      # OPTIONAL, you can comment the line below out for default
+      # values to apply
+      - /home/ubuntu/umap.conf:/etc/umap/umap.conf
 
 volumes:
-  data:
+  umap_userdata:
   db: