1
0

Compare commits

...

3 Commits

Author SHA1 Message Date
92f5f19f03 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.
2022-11-26 19:29:41 +01:00
9da99c6e00 feat(docker-compose): rename containers 2022-11-24 14:33:22 +01:00
b6fbc0e71d change to port 80 2022-11-24 14:30:34 +01:00
3 changed files with 11 additions and 9 deletions

View File

@ -21,12 +21,14 @@ RUN set -eux && \
apt-get autoremove --purge -y && \ apt-get autoremove --purge -y && \
rm -rf /var/lib/apt/lists/* 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 umap.conf /etc/umap/umap.conf
ADD uwsgi.ini /srv/umap/uwsgi.ini ADD uwsgi.ini /srv/umap/uwsgi.ini
ADD drop-privileges.sh /srv/umap/drop-privileges.sh ADD drop-privileges.sh /srv/umap/drop-privileges.sh
ADD docker-entrypoint.sh /srv/umap/docker-entrypoint.sh ADD docker-entrypoint.sh /srv/umap/docker-entrypoint.sh
EXPOSE 8000/tcp EXPOSE 80/tcp
# Add Tini # Add Tini
ENV TINI_VERSION v0.14.0 ENV TINI_VERSION v0.14.0

View File

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

View File

@ -2,7 +2,7 @@
uid = umap uid = umap
gid = users gid = users
enable-threads = true enable-threads = true
http-socket = :8000 http-socket = :80
# Python related settings # Python related settings
# the base directory (full path) # the base directory (full path)