pull/25/head
Etienne Trimaille 2015-12-28 11:48:42 +01:00
rodzic f0ac9317c8
commit 2352363666
2 zmienionych plików z 13 dodań i 3 usunięć

Wyświetl plik

@ -22,6 +22,13 @@ rundev:
@echo "------------------------------------------------------------------" @echo "------------------------------------------------------------------"
@docker-compose -p $(PROJECT_ID) up @docker-compose -p $(PROJECT_ID) up
stop:
@echo
@echo "------------------------------------------------------------------"
@echo "Stopping in production mode"
@echo "------------------------------------------------------------------"
@docker-compose -p $(PROJECT_ID) stop
kill: kill:
@echo @echo
@echo "------------------------------------------------------------------" @echo "------------------------------------------------------------------"
@ -41,11 +48,11 @@ ipdb:
@echo "------------------------------------------------------------------" @echo "------------------------------------------------------------------"
@echo "Database's IP" @echo "Database's IP"
@echo "------------------------------------------------------------------" @echo "------------------------------------------------------------------"
@docker inspect $(PROJECT_ID)_db_1 | grep '"IPAddress"' | head -1 | cut -d '"' -f 4 @docker inspect $(PROJECT_ID)_db | grep '"IPAddress"' | head -1 | cut -d '"' -f 4
timestamp: timestamp:
@echo @echo
@echo "------------------------------------------------------------------" @echo "------------------------------------------------------------------"
@echo "Timestamp" @echo "Timestamp"
@echo "------------------------------------------------------------------" @echo "------------------------------------------------------------------"
@docker exec -t -i $(PROJECT_ID)_imposm_1 cat /home/settings/timestamp.txt @docker exec -t -i $(PROJECT_ID)_imposm cat /home/settings/timestamp.txt

Wyświetl plik

@ -1,5 +1,6 @@
storage: storage:
image: ubuntu:latest image: ubuntu:latest
container_name: dockerosm_storage
hostname: storage hostname: storage
volumes: volumes:
# These are sharable to other containers # These are sharable to other containers
@ -14,14 +15,15 @@ storage:
db: db:
# About the postgresql version, it should match in the dockerfile of docker-imposm3 # About the postgresql version, it should match in the dockerfile of docker-imposm3
image: kartoza/postgis:9.4-2.1 image: kartoza/postgis:9.4-2.1
container_name: dockerosm_db
hostname: db hostname: db
environment: environment:
- USERNAME=docker - USERNAME=docker
- PASS=docker - PASS=docker
imposm: imposm:
#image: kartoza/imposm
build: docker-imposm3 build: docker-imposm3
container_name: dockerosm_imposm
volumes_from: volumes_from:
- storage - storage
links: links:
@ -58,6 +60,7 @@ imposm:
osmupdate: osmupdate:
build: docker-osmupdate build: docker-osmupdate
container_name: dockerosm_osmupdate
volumes_from: volumes_from:
- storage - storage
environment: environment: