Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dgx #59

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Dgx #59

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM python:3.9-slim

ARG http_proxy=http://10.100.9.1:2001
ARG https_proxy=http://10.100.9.1:2001
RUN apt-get update && apt-get -y install gcc libpq-dev

RUN mkdir -p /usr/src/app
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ volumes:
services:
postgres:
image: "openmaptiles/postgis:2.9"
command: postgres -c 'max_connections=400'
volumes:
- pgdata:/var/lib/postgresql/data
ports:
Expand Down
4 changes: 3 additions & 1 deletion explorer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM node:8.9-stretch as builder

ARG http_proxy=http://10.100.9.1:2001
ARG https_proxy=http://10.100.9.1:2001
RUN mkdir -p /tmp/cosmo_build
COPY . /tmp/cosmo_build
RUN cd /tmp/cosmo_build &&\
Expand All @@ -9,4 +10,5 @@ RUN cd /tmp/cosmo_build &&\

FROM nginx:alpine
COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/nginx.conf
COPY --from=builder /tmp/cosmo_build/ /usr/share/nginx/html/
31 changes: 31 additions & 0 deletions explorer/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
user nginx;
worker_processes 8;

error_log /var/log/nginx/error.log notice;
pid /var/run/nginx.pid;


events {
worker_connections 512;
}


http {
include /etc/nginx/mime.types;
default_type application/octet-stream;

log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /var/log/nginx/access.log main;

sendfile on;
#tcp_nopush on;

keepalive_timeout 65;

#gzip on;

include /etc/nginx/conf.d/*.conf;
}
1 change: 0 additions & 1 deletion explorer/nginx.vh.default.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
server {
listen 80;
server_name ~.;

#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;

Expand Down
3 changes: 3 additions & 0 deletions importer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM python:3.9-slim

ARG http_proxy=http://10.100.9.1:2001
ARG https_proxy=http://10.100.9.1:2001

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED=1

Expand Down
3 changes: 2 additions & 1 deletion tiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# t-rex v0.9.2
FROM sourcepole/t-rex@sha256:c28eb34e46cd2526a3b88be600e680838263852a53afe7a7a2bfe02d0482abf0

ARG http_proxy=http://10.100.9.1:2001
ARG https_proxy=http://10.100.9.1:2001

# we need to install envsubst
USER root
Expand Down
2 changes: 1 addition & 1 deletion tiles/config.toml.template
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ simplify = true
sql = """
SELECT id, name, admin_level, zone_type, geometry
FROM $TABLE_SPACE.zones
WHERE geometry && !bbox!
WHERE geometry && !bbox!
"""

[cache.file]
Expand Down