Skip to content

Commit

Permalink
Fix dependencies of Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
yuiseki committed Apr 12, 2024
1 parent 4890ecd commit 8306e6d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,21 @@ RUN apt-get -y install \
libboost-iostreams-dev \
libboost-program-options-dev \
libboost-system-dev \
lua5.1 \
liblua5.1-0-dev \
libprotobuf-dev \
libshp-dev \
protobuf-compiler \
rapidjson-dev

RUN git clone --depth 1 https://github.com/systemed/tilemaker &&\
cd tilemaker; make -j3 LDFLAGS="-latomic"; make install; cd .. &&\
cd tilemaker; make -j 3; make install; cd .. &&\
cp tilemaker/resources/config-openmaptiles.json ./config.json &&\
cp tilemaker/resources/process-openmaptiles.lua ./process.lua &&\
rm -rf tilemaker

RUN git clone --depth 1 https://github.com/felt/tippecanoe &&\
cd tippecanoe; make -j3 LDFLAGS="-latomic"; make install &&\
cd tippecanoe; make -j 3; make install &&\
cd ..; rm -rf tippecanoe

RUN curl -Ls https://deb.nodesource.com/setup_18.x | bash
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $(admin_geojson):
-i \
--rm \
--mount type=bind,source=$(CURDIR)/tmp,target=/tmp \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
bash -c "\
osmtogeojson /$(admin_osmjson) > /$(admin_geojson)\
"
Expand All @@ -115,15 +115,15 @@ $(admin_poly):
-i \
--rm \
--mount type=bind,source=$(CURDIR)/tmp,target=/tmp \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
geojson2poly /$(admin_geojson) /$(admin_poly)

$(admin_pbf):
docker run \
-i \
--rm \
--mount type=bind,source=$(CURDIR)/tmp,target=/tmp \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
osmconvert /$(region_pbf) -B="/$(admin_poly)" --complete-ways -o=/$(admin_pbf)


Expand All @@ -137,7 +137,7 @@ $(mbtiles):
-i \
--rm \
--mount type=bind,source=$(CURDIR)/tmp,target=/tmp \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
tilemaker \
--threads 3 \
--skip-integrity \
Expand All @@ -152,7 +152,7 @@ $(tilejson):
-i \
--rm \
--mount type=bind,source=$(CURDIR)/tmp,target=/tmp \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
mbtiles2tilejson \
/tmp/region.mbtiles \
--url $(TILES_URL) > docs/tiles.json
Expand All @@ -169,7 +169,7 @@ $(zxy_metadata):
-i \
--rm \
--mount type=bind,source=$(CURDIR)/tmp,target=/tmp \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
tile-join \
--force \
--no-tile-compression \
Expand All @@ -189,7 +189,7 @@ $(stylejson):
-i \
--rm \
--mount type=bind,source=$(CURDIR)/,target=/app \
yuiseki/vector-tile-builder \
yuiseki/vector-tile-builder:latest \
charites build style.yml docs/style.json
sed "s|http://localhost:5000/|$(BASE_PATH)|g" -i docs/style.json

Expand Down

0 comments on commit 8306e6d

Please sign in to comment.