From 6093c1f9c22d75551e010dc3cd8759383e3ff74f Mon Sep 17 00:00:00 2001 From: zstadler Date: Mon, 11 Feb 2019 14:41:00 +0200 Subject: [PATCH] Fix `make 'forced-clean-sql'` failure on Windows Resolve #580 --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 0c50991f..2b6dac13 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ download-geofabrik: @echo " " psql: db-start - docker-compose run --rm import-osm /usr/src/app/psql.sh + docker-compose run --rm import-osm ./psql.sh cfg-remake: docker-compose run --rm openmaptiles-tools make clean @@ -183,29 +183,29 @@ 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+" + docker-compose run --rm import-osm ./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();' + docker-compose run --rm import-osm ./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';" + docker-compose run --rm import-osm ./psql.sh -c "DROP SCHEMA IF EXISTS public CASCADE ; CREATE SCHEMA IF NOT EXISTS public; " + docker-compose run --rm import-osm ./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 ./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 + docker-compose run --rm import-osm ./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 + docker-compose run --rm import-osm ./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;' + docker-compose run --rm import-osm ./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;' + docker-compose run --rm import-osm ./psql.sh -P pager=off -c 'ANALYZE VERBOSE;' list-docker-images: docker images | grep openmaptiles