diff --git a/Dockerfile b/Dockerfile index 1a689e0..4305edb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,14 +21,12 @@ 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 ADD docker-entrypoint.sh /srv/umap/docker-entrypoint.sh -EXPOSE 80/tcp +EXPOSE 8000/tcp # Add Tini ENV TINI_VERSION v0.14.0 diff --git a/docker-compose.yml b/docker-compose.yml index c3053a7..40cdcca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,31 +1,31 @@ version: '3' services: - postgis: + db: image: postgis/postgis:12-3.3 environment: - POSTGRES_HOST_AUTH_METHOD=trust volumes: - - postgis:/var/lib/postgresql/data + - db:/var/lib/postgresql/data redis: image: redis:latest - umap: + app: image: pommib/umap:1.2.3 ports: - - "8000:80" + - "8000:8000" environment: - - DATABASE_URL=postgis://postgres@postgis/postgres + - DATABASE_URL=postgis://postgres@db/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: - - postgis + - db - redis # command: "tail -F anything" volumes: - postgis: + db: uploads: diff --git a/uwsgi.ini b/uwsgi.ini index f9a565a..755cb81 100644 --- a/uwsgi.ini +++ b/uwsgi.ini @@ -2,7 +2,7 @@ uid = umap gid = users enable-threads = true -http-socket = :80 +http-socket = :8000 # Python related settings # the base directory (full path)