1
0

Compare commits

..

No commits in common. "92f5f19f036e6418968f1756f7ed5f3b918eec4b" and "4cb30fca865a1c5b8570642dfcef71f5a974ac93" have entirely different histories.

3 changed files with 9 additions and 11 deletions

View File

@ -21,14 +21,12 @@ 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 80/tcp EXPOSE 8000/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:
postgis: db:
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:
- postgis:/var/lib/postgresql/data - db:/var/lib/postgresql/data
redis: redis:
image: redis:latest image: redis:latest
umap: app:
image: pommib/umap:1.2.3 image: pommib/umap:1.2.3
ports: ports:
- "8000:80" - "8000:8000"
environment: environment:
- DATABASE_URL=postgis://postgres@postgis/postgres - DATABASE_URL=postgis://postgres@db/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:
- postgis - db
- redis - redis
# command: "tail -F anything" # command: "tail -F anything"
volumes: volumes:
postgis: db:
uploads: uploads:

View File

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