kopia lustrzana https://github.com/openmaptiles/openmaptiles
Removed TOOLS_VERSION, rewritten commands to use only docker-compose with TOOLS_VERSION inside .env.
rodzic
32433a53a3
commit
434c0500f3
7
Makefile
7
Makefile
|
@ -4,9 +4,6 @@ DC_OPTS?=--rm
|
|||
# container runs as the current user rather than root (so that created files are not root-owned)
|
||||
DC_USER_OPTS?=$(DC_OPTS) -u $$(id -u $${USER}):$$(id -g $${USER})
|
||||
|
||||
TOOLS_VERSION?=$(shell cat TOOLS_VERSION)
|
||||
export TOOLS_VERSION
|
||||
|
||||
.PHONY: all
|
||||
all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
|
||||
|
||||
|
@ -182,7 +179,7 @@ etl-graph:
|
|||
|
||||
# generate etl graph for a certain layer, e.g. etl-graph-building, etl-graph-place
|
||||
etl-graph-%: layers/% build/devdoc
|
||||
docker run $(DC_USER_OPTS) -v $$(pwd):/tileset openmaptiles/openmaptiles-tools:${TOOLS_VERSION} generate-etlgraph layers/$*/$*.yaml ./build/devdoc
|
||||
docker-compose run $(DC_USER_OPTS) openmaptiles-tools generate-etlgraph layers/$*/$*.yaml ./build/devdoc
|
||||
cp ./build/devdoc/etl_$*.png layers/$*/etl_diagram.png
|
||||
|
||||
|
||||
|
@ -197,7 +194,7 @@ mapping-graph:
|
|||
@echo 'Valid layers: $(mappingLayers)'
|
||||
|
||||
mapping-graph-%: ./layers/%/mapping.yaml build/devdoc
|
||||
docker run $(DC_USER_OPTS) -v $$(pwd):/tileset openmaptiles/openmaptiles-tools:${TOOLS_VERSION} generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$*
|
||||
docker-compose run $(DC_USER_OPTS) openmaptiles-tools generate-mapping-graph layers/$*/$*.yaml ./build/devdoc/mapping-diagram-$*
|
||||
cp ./build/devdoc/mapping-diagram-$*.png layers/$*/mapping_diagram.png
|
||||
|
||||
# generate all etl and mapping graphs
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
3.1.0
|
|
@ -13,8 +13,7 @@ do
|
|||
echo " "
|
||||
echo "## $layerid z$z - freq"
|
||||
|
||||
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}"
|
||||
SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
|
||||
SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
|
||||
|
||||
SQLCODE=$(cat <<-END
|
||||
select $classvars , count(*) as _count_ from
|
||||
|
|
|
@ -13,8 +13,7 @@ do
|
|||
echo " "
|
||||
echo "## $layerid z$z - $var "
|
||||
|
||||
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}"
|
||||
SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
|
||||
SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
|
||||
|
||||
SQLCODE=$(cat <<-END
|
||||
SELECT
|
||||
|
|
|
@ -11,8 +11,7 @@ do
|
|||
echo " "
|
||||
echo "## $layerid z$z max length ($classvar)"
|
||||
|
||||
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}"
|
||||
SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
|
||||
SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
|
||||
|
||||
SQLCODE=$(cat <<-END
|
||||
SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from
|
||||
|
|
|
@ -35,8 +35,6 @@ MIN_DOCKER_VER=1.12.3
|
|||
STARTTIME=$(date +%s)
|
||||
STARTDATE=$(date +"%Y-%m-%dT%H:%M%z")
|
||||
githash=$( git rev-parse HEAD )
|
||||
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/TOOLS_VERSION")}"
|
||||
export TOOLS_VERSION
|
||||
|
||||
# Options to run with docker and docker-compose - ensure the container is destroyed on exit,
|
||||
# as well as pass any other common parameters.
|
||||
|
|
Ładowanie…
Reference in New Issue