kopia lustrzana https://github.com/kartoza/docker-osm
logs and small updates
rodzic
047aa8bb77
commit
b72a0cbb00
13
Makefile
13
Makefile
|
@ -1,4 +1,5 @@
|
|||
PROJECT_ID := dockerosm
|
||||
COMPOSE_FILE := docker-compose.yml
|
||||
|
||||
|
||||
build:
|
||||
|
@ -6,42 +7,42 @@ build:
|
|||
@echo "------------------------------------------------------------------"
|
||||
@echo "Building in production mode"
|
||||
@echo "------------------------------------------------------------------"
|
||||
@docker-compose -p $(PROJECT_ID) build
|
||||
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) build
|
||||
|
||||
run:
|
||||
@echo
|
||||
@echo "------------------------------------------------------------------"
|
||||
@echo "Running in production mode"
|
||||
@echo "------------------------------------------------------------------"
|
||||
@docker-compose -p $(PROJECT_ID) up -d --no-recreate
|
||||
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) up -d --no-recreate
|
||||
|
||||
rundev:
|
||||
@echo
|
||||
@echo "------------------------------------------------------------------"
|
||||
@echo "Running in DEVELOPMENT mode"
|
||||
@echo "------------------------------------------------------------------"
|
||||
@docker-compose -p $(PROJECT_ID) up
|
||||
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) up
|
||||
|
||||
stop:
|
||||
@echo
|
||||
@echo "------------------------------------------------------------------"
|
||||
@echo "Stopping in production mode"
|
||||
@echo "------------------------------------------------------------------"
|
||||
@docker-compose -p $(PROJECT_ID) stop
|
||||
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) stop
|
||||
|
||||
kill:
|
||||
@echo
|
||||
@echo "------------------------------------------------------------------"
|
||||
@echo "Killing in production mode"
|
||||
@echo "------------------------------------------------------------------"
|
||||
@docker-compose -p $(PROJECT_ID) kill
|
||||
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) kill
|
||||
|
||||
rm: kill
|
||||
@echo
|
||||
@echo "------------------------------------------------------------------"
|
||||
@echo "Removing production instance!!! "
|
||||
@echo "------------------------------------------------------------------"
|
||||
@docker-compose -p $(PROJECT_ID) rm
|
||||
@docker-compose -f $(COMPOSE_FILE) -p $(PROJECT_ID) rm
|
||||
|
||||
ipdb:
|
||||
@echo
|
||||
|
|
|
@ -22,6 +22,8 @@ db:
|
|||
- PASS=docker
|
||||
volumes_from:
|
||||
- storage
|
||||
ports:
|
||||
- "5433:5432"
|
||||
|
||||
imposm:
|
||||
build: docker-imposm3
|
||||
|
|
|
@ -127,6 +127,8 @@ class Importer(object):
|
|||
for clip_file in listdir(clip_folder):
|
||||
if clip_file == 'clip.shp':
|
||||
self.clip_shape_file = join(clip_folder, clip_file)
|
||||
if clip_file == 'clip.sql':
|
||||
self.clip_sql_file = join(clip_folder, clip_file)
|
||||
|
||||
if not self.osm_file:
|
||||
msg = 'OSM file *.pbf is missing in %s' % self.default['SETTINGS']
|
||||
|
@ -154,6 +156,7 @@ class Importer(object):
|
|||
self.error(msg)
|
||||
elif self.clip_shape_file and self.default['QGIS_STYLE']:
|
||||
self.info('%s detected for clipping.' % self.clip_shape_file)
|
||||
self.info('%s detected for clipping.' % self.clip_sql_file)
|
||||
else:
|
||||
self.info('No *.shp detected in %s, so no clipping.' % self.default['SETTINGS'])
|
||||
|
||||
|
|
|
@ -151,6 +151,7 @@ class Downloader(object):
|
|||
sleep(2.0)
|
||||
else:
|
||||
# Everything was fine, let's sleeping.
|
||||
self.info('Creating diff successful : %s' % file_name)
|
||||
self.info('Sleeping for %s seconds.' % self.default['TIME'])
|
||||
sleep(float(self.default['TIME']))
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue