cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #736 from MartinMikita/fix-docker-compose-tool-version

Browse Source 
Fixed docker-compose commands.
This commit is contained in:
Eva Jelinkova 2019-12-19 11:59:07 +01:00 committed by GitHub
commit 831bb6fe4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -6,6 +6,7 @@ POSTGRES_PORT=5432
QUICKSTART_MIN_ZOOM=0 QUICKSTART_MIN_ZOOM=0
QUICKSTART_MAX_ZOOM=7 QUICKSTART_MAX_ZOOM=7
DIFF_MODE=false DIFF_MODE=false
TOOLS_VERSION=3.1.0
BBOX=-180.0,-85.0511,180.0,85.0511 BBOX=-180.0,-85.0511,180.0,85.0511
MIN_ZOOM=0 MIN_ZOOM=0

7
Makefile
View File

@ -4,9 +4,6 @@ DC_OPTS?=--rm
# container runs as the current user rather than root (so that created files are not root-owned) # 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}) DC_USER_OPTS?=$(DC_OPTS) -u $$(id -u $${USER}):$$(id -g $${USER})
TOOLS_VERSION?=$(shell cat TOOLS_VERSION)
export TOOLS_VERSION
# If running in the test mode, compare files rather than copy them # If running in the test mode, compare files rather than copy them
TEST_MODE?=no TEST_MODE?=no
ifeq ($(TEST_MODE),yes) ifeq ($(TEST_MODE),yes)
@ -190,7 +187,7 @@ etl-graph:
# generate etl graph for a certain layer, e.g. etl-graph-building, etl-graph-place # generate etl graph for a certain layer, e.g. etl-graph-building, etl-graph-place
etl-graph-%: layers/% build/devdoc 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
@$(COPY_TO_GIT) ./build/devdoc/etl_$*.png layers/$*/etl_diagram.png @$(COPY_TO_GIT) ./build/devdoc/etl_$*.png layers/$*/etl_diagram.png
@ -205,7 +202,7 @@ mapping-graph:
@echo 'Valid layers: $(mappingLayers)' @echo 'Valid layers: $(mappingLayers)'
mapping-graph-%: ./layers/%/mapping.yaml build/devdoc 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-$*
@$(COPY_TO_GIT) ./build/devdoc/mapping-diagram-$*.png layers/$*/mapping_diagram.png @$(COPY_TO_GIT) ./build/devdoc/mapping-diagram-$*.png layers/$*/mapping_diagram.png
# generate all etl and mapping graphs # generate all etl and mapping graphs

1
TOOLS_VERSION
View File

@ -1 +0,0 @@
3.1.0

3
qa/layer_freq.sh
View File

@ -13,8 +13,7 @@ do
echo " " echo " "
echo "## $layerid z$z - freq" echo "## $layerid z$z - freq"
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}" SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQLCODE=$(cat <<-END SQLCODE=$(cat <<-END
select $classvars , count(*) as _count_ from select $classvars , count(*) as _count_ from

3
qa/layer_numvar_analyze.sh
View File

@ -13,8 +13,7 @@ do
echo " " echo " "
echo "## $layerid z$z - $var " echo "## $layerid z$z - $var "
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}" SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQLCODE=$(cat <<-END SQLCODE=$(cat <<-END
SELECT SELECT

3
qa/layer_toplength.sh
View File

@ -11,8 +11,7 @@ do
echo " " echo " "
echo "## $layerid z$z max length ($classvar)" echo "## $layerid z$z max length ($classvar)"
: "${TOOLS_VERSION:=$(cat "$(dirname "$0")/../TOOLS_VERSION")}" SQL=$(docker-compose run --rm openmaptiles-tools generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQL=$(docker run --rm -v "$(pwd):/tileset" "openmaptiles/openmaptiles-tools:$TOOLS_VERSION" generate-sqlquery layers/${layerid}/${layerid}.yaml $z )
SQLCODE=$(cat <<-END SQLCODE=$(cat <<-END
SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from SELECT DISTINCT $classvar , length( $classvar ) AS _length_ from

2
quickstart.sh
View File

@ -35,8 +35,6 @@ MIN_DOCKER_VER=1.12.3
STARTTIME=$(date +%s) STARTTIME=$(date +%s)
STARTDATE=$(date +"%Y-%m-%dT%H:%M%z") STARTDATE=$(date +"%Y-%m-%dT%H:%M%z")
githash=$( git rev-parse HEAD ) 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, # Options to run with docker and docker-compose - ensure the container is destroyed on exit,
# as well as pass any other common parameters. # as well as pass any other common parameters.