Cleaned Makefile, simple tasks moved upper, dev or specific moved down. Added start-postserve.
This commit is contained in:
MartinMikita
parent
8bac80cd09
commit
ab7eabe0e7
170
Makefile
170
Makefile
@ -9,7 +9,7 @@ help:
|
|||||||
@echo " ./quickstart.sh <<your-area>> # example: ./quickstart.sh madagascar "
|
@echo " ./quickstart.sh <<your-area>> # example: ./quickstart.sh madagascar "
|
||||||
@echo " "
|
@echo " "
|
||||||
@echo "Hints for designers:"
|
@echo "Hints for designers:"
|
||||||
@echo " ....TODO.... # start Maputnik "
|
@echo " make start-postserve # start Postserver + Maputnik Editor [ see localhost:8088 ] "
|
||||||
@echo " make start-tileserver # start klokantech/tileserver-gl [ see localhost:8080 ] "
|
@echo " make start-tileserver # start klokantech/tileserver-gl [ see localhost:8080 ] "
|
||||||
@echo " make start-mapbox-studio # start Mapbox Studio"
|
@echo " make start-mapbox-studio # start Mapbox Studio"
|
||||||
@echo " "
|
@echo " "
|
||||||
@ -53,52 +53,8 @@ clean-docker:
|
|||||||
docker-compose rm -fv
|
docker-compose rm -fv
|
||||||
docker volume ls -q | grep openmaptiles | xargs -r docker volume rm || true
|
docker volume ls -q | grep openmaptiles | xargs -r docker volume rm || true
|
||||||
|
|
||||||
list-docker-images:
|
db-start:
|
||||||
docker images | grep openmaptiles
|
docker-compose up -d postgres
|
||||||
|
|
||||||
refresh-docker-images:
|
|
||||||
docker-compose pull --ignore-pull-failures
|
|
||||||
|
|
||||||
remove-docker-images:
|
|
||||||
@echo "Deleting all openmaptiles related docker image(s)..."
|
|
||||||
@docker-compose down
|
|
||||||
@docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f
|
|
||||||
@docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f
|
|
||||||
@docker images | grep "klokantech/tileserver-gl" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f
|
|
||||||
|
|
||||||
docker-unnecessary-clean:
|
|
||||||
@echo "Deleting unnecessary container(s)..."
|
|
||||||
@docker ps -a | grep Exited | awk -F" " '{print $$1}' | xargs --no-run-if-empty docker rm
|
|
||||||
@echo "Deleting unnecessary image(s)..."
|
|
||||||
@docker images | grep \<none\> | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi
|
|
||||||
|
|
||||||
psql:
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh
|
|
||||||
|
|
||||||
psql-list-tables:
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c "\d+"
|
|
||||||
|
|
||||||
psql-pg-stat-reset:
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'SELECT pg_stat_statements_reset();'
|
|
||||||
|
|
||||||
forced-clean-sql:
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "DROP SCHEMA IF EXISTS public CASCADE ; CREATE SCHEMA IF NOT EXISTS public; "
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE EXTENSION hstore; CREATE EXTENSION postgis; CREATE EXTENSION unaccent; CREATE EXTENSION fuzzystrmatch; CREATE EXTENSION osml10n; CREATE EXTENSION pg_stat_statements;"
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "GRANT ALL ON SCHEMA public TO public;COMMENT ON SCHEMA public IS 'standard public schema';"
|
|
||||||
|
|
||||||
pgclimb-list-views:
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/pgclimb.sh -c "select schemaname,viewname from pg_views where schemaname='public' order by viewname;" csv
|
|
||||||
|
|
||||||
pgclimb-list-tables:
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/pgclimb.sh -c "select schemaname,tablename from pg_tables where schemaname='public' order by tablename;" csv
|
|
||||||
|
|
||||||
psql-vacuum-analyze:
|
|
||||||
@echo "Start - postgresql: VACUUM ANALYZE VERBOSE;"
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'VACUUM ANALYZE VERBOSE;'
|
|
||||||
|
|
||||||
psql-analyze:
|
|
||||||
@echo "Start - postgresql: ANALYZE VERBOSE ;"
|
|
||||||
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'ANALYZE VERBOSE;'
|
|
||||||
|
|
||||||
download-geofabrik:
|
download-geofabrik:
|
||||||
@echo =============== download-geofabrik =======================
|
@echo =============== download-geofabrik =======================
|
||||||
@ -112,42 +68,30 @@ download-geofabrik:
|
|||||||
cat ./data/docker-compose-config.yml
|
cat ./data/docker-compose-config.yml
|
||||||
@echo " "
|
@echo " "
|
||||||
|
|
||||||
# the `download-geofabrik` error message mention `list`, if the area parameter is wrong. so I created a similar make command
|
psql: db-start
|
||||||
list:
|
docker-compose run --rm import-osm /usr/src/app/psql.sh
|
||||||
docker-compose run --rm import-osm ./download-geofabrik-list.sh
|
|
||||||
|
|
||||||
# same as a `make list`
|
|
||||||
download-geofabrik-list:
|
|
||||||
docker-compose run --rm import-osm ./download-geofabrik-list.sh
|
|
||||||
|
|
||||||
download-wikidata:
|
|
||||||
mkdir -p wikidata && docker-compose run --rm --entrypoint /usr/src/app/download-gz.sh import-wikidata
|
|
||||||
|
|
||||||
cfg-remake:
|
cfg-remake:
|
||||||
docker-compose run --rm openmaptiles-tools make clean
|
docker-compose run --rm openmaptiles-tools make clean
|
||||||
docker-compose run --rm openmaptiles-tools make
|
docker-compose run --rm openmaptiles-tools make
|
||||||
|
|
||||||
|
import-osm: db-start
|
||||||
|
docker-compose run --rm openmaptiles-tools make clean
|
||||||
|
docker-compose run --rm openmaptiles-tools make
|
||||||
|
docker-compose run --rm import-osm
|
||||||
|
|
||||||
import-osmsql:
|
import-sql: db-start
|
||||||
|
docker-compose run --rm openmaptiles-tools make clean
|
||||||
|
docker-compose run --rm openmaptiles-tools make
|
||||||
|
docker-compose run --rm import-sql
|
||||||
|
|
||||||
|
import-osmsql: db-start
|
||||||
docker-compose run --rm openmaptiles-tools make clean
|
docker-compose run --rm openmaptiles-tools make clean
|
||||||
docker-compose run --rm openmaptiles-tools make
|
docker-compose run --rm openmaptiles-tools make
|
||||||
docker-compose run --rm import-osm
|
docker-compose run --rm import-osm
|
||||||
docker-compose run --rm import-sql
|
docker-compose run --rm import-sql
|
||||||
|
|
||||||
import-osm:
|
generate-tiles: db-start
|
||||||
docker-compose run --rm openmaptiles-tools make clean
|
|
||||||
docker-compose run --rm openmaptiles-tools make
|
|
||||||
docker-compose run --rm import-osm
|
|
||||||
|
|
||||||
import-sql:
|
|
||||||
docker-compose run --rm openmaptiles-tools make clean
|
|
||||||
docker-compose run --rm openmaptiles-tools make
|
|
||||||
docker-compose run --rm import-sql
|
|
||||||
|
|
||||||
psql-start:
|
|
||||||
docker-compose up -d postgres
|
|
||||||
|
|
||||||
generate-tiles:
|
|
||||||
rm -rf data/tiles.mbtiles
|
rm -rf data/tiles.mbtiles
|
||||||
docker-compose run --rm openmaptiles-tools make clean
|
docker-compose run --rm openmaptiles-tools make clean
|
||||||
docker-compose run --rm openmaptiles-tools make
|
docker-compose run --rm openmaptiles-tools make
|
||||||
@ -159,6 +103,7 @@ generate-tiles:
|
|||||||
docker-compose run --rm openmaptiles-tools generate-metadata ./data/tiles.mbtiles
|
docker-compose run --rm openmaptiles-tools generate-metadata ./data/tiles.mbtiles
|
||||||
docker-compose run --rm openmaptiles-tools chmod 666 ./data/tiles.mbtiles
|
docker-compose run --rm openmaptiles-tools chmod 666 ./data/tiles.mbtiles
|
||||||
|
|
||||||
|
|
||||||
start-tileserver:
|
start-tileserver:
|
||||||
@echo " "
|
@echo " "
|
||||||
@echo "***********************************************************"
|
@echo "***********************************************************"
|
||||||
@ -177,11 +122,35 @@ start-tileserver:
|
|||||||
@echo "* "
|
@echo "* "
|
||||||
@echo "***********************************************************"
|
@echo "***********************************************************"
|
||||||
@echo " "
|
@echo " "
|
||||||
docker run -it --rm -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl
|
docker run -it --rm --name tileserver-gl -v $$(pwd)/data:/data -p 8080:80 klokantech/tileserver-gl
|
||||||
|
|
||||||
|
start-postserve:
|
||||||
|
@echo " "
|
||||||
|
@echo "***********************************************************"
|
||||||
|
@echo "* "
|
||||||
|
@echo "* Bring up postserve at localhost:8090/tiles/{z}/{x}/{y}.pbf"
|
||||||
|
@echo "* "
|
||||||
|
@echo "***********************************************************"
|
||||||
|
@echo " "
|
||||||
|
docker-compose up -d postserve
|
||||||
|
docker pull maputnik/editor
|
||||||
|
@echo " "
|
||||||
|
@echo "***********************************************************"
|
||||||
|
@echo "* "
|
||||||
|
@echo "* Start maputnik/editor "
|
||||||
|
@echo "* ----------------------------> check localhost:8088 "
|
||||||
|
@echo "* "
|
||||||
|
@echo "***********************************************************"
|
||||||
|
@echo " "
|
||||||
|
docker rm -f maputnik_editor || true
|
||||||
|
docker run --name maputnik_editor -d -p 8088:8888 maputnik/editor
|
||||||
|
|
||||||
|
|
||||||
start-mapbox-studio:
|
start-mapbox-studio:
|
||||||
docker-compose up mapbox-studio
|
docker-compose up mapbox-studio
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
generate-qareports:
|
generate-qareports:
|
||||||
./qa/run.sh
|
./qa/run.sh
|
||||||
|
|
||||||
@ -208,3 +177,58 @@ import-sql-dev:
|
|||||||
|
|
||||||
import-osm-dev:
|
import-osm-dev:
|
||||||
docker-compose run --rm import-osm /bin/bash
|
docker-compose run --rm import-osm /bin/bash
|
||||||
|
|
||||||
|
# the `download-geofabrik` error message mention `list`, if the area parameter is wrong. so I created a similar make command
|
||||||
|
list:
|
||||||
|
docker-compose run --rm import-osm ./download-geofabrik-list.sh
|
||||||
|
|
||||||
|
# same as a `make list`
|
||||||
|
download-geofabrik-list:
|
||||||
|
docker-compose run --rm import-osm ./download-geofabrik-list.sh
|
||||||
|
|
||||||
|
download-wikidata:
|
||||||
|
mkdir -p wikidata && docker-compose run --rm --entrypoint /usr/src/app/download-gz.sh import-wikidata
|
||||||
|
|
||||||
|
psql-list-tables:
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c "\d+"
|
||||||
|
|
||||||
|
psql-pg-stat-reset:
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'SELECT pg_stat_statements_reset();'
|
||||||
|
|
||||||
|
forced-clean-sql:
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "DROP SCHEMA IF EXISTS public CASCADE ; CREATE SCHEMA IF NOT EXISTS public; "
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "CREATE EXTENSION hstore; CREATE EXTENSION postgis; CREATE EXTENSION unaccent; CREATE EXTENSION fuzzystrmatch; CREATE EXTENSION osml10n; CREATE EXTENSION pg_stat_statements;"
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -c "GRANT ALL ON SCHEMA public TO public;COMMENT ON SCHEMA public IS 'standard public schema';"
|
||||||
|
|
||||||
|
pgclimb-list-views:
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/pgclimb.sh -c "select schemaname,viewname from pg_views where schemaname='public' order by viewname;" csv
|
||||||
|
|
||||||
|
pgclimb-list-tables:
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/pgclimb.sh -c "select schemaname,tablename from pg_tables where schemaname='public' order by tablename;" csv
|
||||||
|
|
||||||
|
psql-vacuum-analyze:
|
||||||
|
@echo "Start - postgresql: VACUUM ANALYZE VERBOSE;"
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'VACUUM ANALYZE VERBOSE;'
|
||||||
|
|
||||||
|
psql-analyze:
|
||||||
|
@echo "Start - postgresql: ANALYZE VERBOSE ;"
|
||||||
|
docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'ANALYZE VERBOSE;'
|
||||||
|
|
||||||
|
list-docker-images:
|
||||||
|
docker images | grep openmaptiles
|
||||||
|
|
||||||
|
refresh-docker-images:
|
||||||
|
docker-compose pull --ignore-pull-failures
|
||||||
|
|
||||||
|
remove-docker-images:
|
||||||
|
@echo "Deleting all openmaptiles related docker image(s)..."
|
||||||
|
@docker-compose down
|
||||||
|
@docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f
|
||||||
|
@docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f
|
||||||
|
@docker images | grep "klokantech/tileserver-gl" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi -f
|
||||||
|
|
||||||
|
docker-unnecessary-clean:
|
||||||
|
@echo "Deleting unnecessary container(s)..."
|
||||||
|
@docker ps -a | grep Exited | awk -F" " '{print $$1}' | xargs --no-run-if-empty docker rm
|
||||||
|
@echo "Deleting unnecessary image(s)..."
|
||||||
|
@docker images | grep \<none\> | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user