[WIP] adapt to kartotherian as a monolith

Bug: T262523
thesocialdev · Feb 16, 2022 · fec4bb6 · fec4bb6
1 parent 1b6dde8
commit fec4bb6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/kartotherian/config.kartotherian.docker.template.yaml b/kartotherian/config.kartotherian.docker.template.yaml
@@ -69,19 +69,19 @@ services:
       modules:
       - "tilelive-tmstyle"
       - "tilelive-http"
-      - "@wikimedia/kartotherian-autogen"
-      - "@wikimedia/kartotherian-babel"
-      - "@wikimedia/kartotherian-overzoom"
-      - "@wikimedia/kartotherian-substantial"
+      - "../lib/autogen"
+      - "../lib/babel"
+      - "../lib/overzoom"
+      - "../lib/substantial"
       # - "@wikimedia/kartotherian-tilelive-switch"
       - "@kartotherian/tilelive-tmsource"
       - "@kartotherian/tilelive-vector"
       - "@mapbox/tilejson"
 
       requestHandlers:
-      - "@wikimedia/kartotherian-maki"
-      - "@wikimedia/kartotherian-snapshot"
-      - "@wikimedia/kartotherian-geoshapes"
+      - "../lib/maki"
+      - "../lib/snapshot"
+      - "../lib/geoshapes"
 
       geoshapes:
         allowUserQueries: true

diff --git a/makefile b/makefile
@@ -12,19 +12,20 @@ generate_config:
 	docker-compose exec kartotherian generate_config
 
 run_kartotherian:
-	docker-compose exec kartotherian bash -c "nodemon --ext js,json,yaml --signal SIGHUP /home/kartotherian/packages/kartotherian/server.js -c /etc/opt/config.kartotherian.docker.yaml"
+	docker-compose exec kartotherian bash -c "nodemon --ext js,json,yaml --signal SIGHUP server.js -c /etc/opt/config.kartotherian.docker.yaml"
 
 npm_test:
 	docker-compose exec kartotherian bash -c "npm test"
 
+# FIXME: Waiting for mapnik update to always build from source.
 npm_install:
-	docker-compose exec kartotherian bash -c "npm install --unsafe-perm --loglevel verbose"
+	docker-compose exec kartotherian bash -c "npm install --unsafe-perm --loglevel verbose --build-from-source=@kartotherian/mapnik"
 
 npm_link:
 	docker-compose exec kartotherian bash -c "cd /srv/dependencies/osm-bright.tm2source && npm link"
 	docker-compose exec kartotherian bash -c "cd /srv/dependencies/osm-bright.tm2 && npm link"
-	docker-compose exec kartotherian bash -c "cd /home/kartotherian/packages/kartotherian && npm link @kartotherian/osm-bright-source"
-	docker-compose exec kartotherian bash -c "cd /home/kartotherian/packages/kartotherian && npm link @kartotherian/osm-bright-style"
+	docker-compose exec kartotherian bash -c "npm link @kartotherian/osm-bright-source"
+	docker-compose exec kartotherian bash -c "npm link @kartotherian/osm-bright-style"
 
 clean:
 	docker-compose exec kartotherian bash -c "./clean_node_modules.sh"