From b6fbc0e71dd0c564b38aaae0ae548bf91301ba1f Mon Sep 17 00:00:00 2001
From: Pim van den Berg <pim@nethuis.nl>
Date: Thu, 24 Nov 2022 14:30:34 +0100
Subject: [PATCH 1/3] change to port 80

---
 Dockerfile         | 2 +-
 docker-compose.yml | 2 +-
 uwsgi.ini          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4305edb..da6b012 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ ADD uwsgi.ini /srv/umap/uwsgi.ini
 ADD drop-privileges.sh /srv/umap/drop-privileges.sh
 ADD docker-entrypoint.sh /srv/umap/docker-entrypoint.sh
 
-EXPOSE 8000/tcp
+EXPOSE 80/tcp
 
 # Add Tini
 ENV TINI_VERSION v0.14.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 40cdcca..a0fa65c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
   app:
     image: pommib/umap:1.2.3
     ports:
-      - "8000:8000"
+      - "8000:80"
     environment:
       - DATABASE_URL=postgis://postgres@db/postgres
       - REDIS_URL=redis://redis:6379/0
diff --git a/uwsgi.ini b/uwsgi.ini
index 755cb81..f9a565a 100644
--- a/uwsgi.ini
+++ b/uwsgi.ini
@@ -2,7 +2,7 @@
 uid             = umap
 gid             = users
 enable-threads  = true
-http-socket     = :8000
+http-socket     = :80
 
 # Python related settings
 # the base directory (full path)

From 9da99c6e00b542ac3f7518baa351a2761e68acfb Mon Sep 17 00:00:00 2001
From: Pim van den Berg <pim@nethuis.nl>
Date: Thu, 24 Nov 2022 14:33:22 +0100
Subject: [PATCH 2/3] feat(docker-compose): rename containers

---
 docker-compose.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a0fa65c..c3053a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,31 +1,31 @@
 version: '3'
 services:
-  db:
+  postgis:
     image: postgis/postgis:12-3.3
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
-      - db:/var/lib/postgresql/data
+      - postgis:/var/lib/postgresql/data
 
   redis:
     image: redis:latest
 
-  app:
+  umap:
     image: pommib/umap:1.2.3
     ports:
       - "8000:80"
     environment:
-      - DATABASE_URL=postgis://postgres@db/postgres
+      - DATABASE_URL=postgis://postgres@postgis/postgres
       - REDIS_URL=redis://redis:6379/0
       - SECRET_KEY=some-long-and-weirdly-unrandom-secret-key
       - ALLOWED_HOSTS=*
       - SITE_URL=https://umap.somewhere.nl/
       - LEAFLET_STORAGE_ALLOW_ANONYMOUS=True
     depends_on:
-      - db
+      - postgis
       - redis
         #    command: "tail -F anything"
 
 volumes:
-  db:
+  postgis:
   uploads:

From 92f5f19f036e6418968f1756f7ed5f3b918eec4b Mon Sep 17 00:00:00 2001
From: Pim van den Berg <pim@nethuis.nl>
Date: Sat, 26 Nov 2022 19:29:41 +0100
Subject: [PATCH 3/3] fix: set Cache-Control header to no-cache io.
 must-revalidate for datalayer

"Cache-Control: must-revalidate" without max-age is confusing. Firefox
keeps caching the page, while Chrome doesn't.
---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index da6b012..1a689e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,8 @@ RUN set -eux && \
     apt-get autoremove --purge -y && \
     rm -rf /var/lib/apt/lists/*
 
+RUN sed -i 's/must_revalidate/no_cache/' /srv/umap/venv/lib/python3.9/site-packages/umap/urls.py
+
 ADD umap.conf /etc/umap/umap.conf
 ADD uwsgi.ini /srv/umap/uwsgi.ini
 ADD drop-privileges.sh /srv/umap/drop-privileges.sh