review makefile and default values

pull/45/head
Etienne Trimaille 2018-02-28 12:50:49 +03:00
rodzic 3729585ef7
commit 72bc59e3e9
3 zmienionych plików z 24 dodań i 8 usunięć

Wyświetl plik

@ -4,6 +4,11 @@ COMPOSE_FILE := docker-compose.yml
.PHONY: logs
###
# DOCKER MANAGEMENT
###
build:
@echo
@echo "------------------------------------------------------------------"
@ -60,12 +65,11 @@ live_logs:
@echo "------------------------------------------------------------------"
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) logs -f
ipdb:
@echo
@echo "------------------------------------------------------------------"
@echo "Database's IP"
@echo "------------------------------------------------------------------"
@docker inspect $(PROJECT_ID)_db | grep '"IPAddress"' | head -1 | cut -d '"' -f 4
###
# CLIPPING
###
import_clip:
@echo
@ -81,6 +85,11 @@ remove_clip:
@echo "------------------------------------------------------------------"
@docker exec -t -i $(PROJECT_ID)_db /bin/su - postgres -c "psql gis -c 'DROP TABLE IF EXISTS clip;'"
###
# STATS
###
timestamp:
@echo
@echo "------------------------------------------------------------------"
@ -88,6 +97,11 @@ timestamp:
@echo "------------------------------------------------------------------"
@docker exec -t -i $(PROJECT_ID)_imposm cat /home/settings/timestamp.txt
###
# STYLES
###
import_styles: remove_styles
@echo
@echo "------------------------------------------------------------------"

Wyświetl plik

@ -15,6 +15,7 @@ storage:
db:
# About the postgresql version, it should match in the dockerfile of docker-imposm3
image: kartoza/postgis:9.4-2.1
# image: kartoza/postgis:10.0-2.4
container_name: dockerosm_db
hostname: db
environment:

Wyświetl plik

@ -15,6 +15,7 @@ storage:
db:
# About the postgresql version, it should match in the dockerfile of docker-imposm3
image: kartoza/postgis:9.4-2.1
# image: kartoza/postgis:10.0-2.4
container_name: dockerosm_db
hostname: db
environment:
@ -40,7 +41,7 @@ imposm:
- DATABASE=gis
# seconds between 2 executions of the script
# if 0, then no update will be done, only the first initial import from the PBF
- TIME=0
- TIME=120
# folder for settings (with *.json and *.sql)
- SETTINGS=settings
# folder for caching
@ -89,4 +90,4 @@ osmupdate:
- IMPORT_DONE=import_done
# seconds between 2 executions of the script
# if 0, then no update will be done, only the first initial import from the PBF
- TIME=0
- TIME=120