From 95c54877676645179b02d816ccffdf3f0a2cd02c Mon Sep 17 00:00:00 2001 From: Holger Bruch Date: Mon, 9 Dec 2024 10:56:46 +0100 Subject: [PATCH] Switch to mfdz transformer images --- makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index dfb78bb..ae9378e 100644 --- a/makefile +++ b/makefile @@ -12,7 +12,8 @@ GTFS_VALIDATION_RESULTS = $(GTFS_FEEDS:%=data/www/gtfsvtor_%.html) # Docker image definitions PFADLE_IMAGE=ghcr.io/ad-freiburg/pfaedle:2024-10-31t12-25 GTFSVTOR_IMAGE=mfdz/gtfsvtor -OBA_IMAGE=mfdz/onebusaway-gtfs-modules +OBA_TRANSFORMER_IMAGE=mfdz/onebusaway-gtfs-transformer-cli:4.0.1-SNAPSHOT +OBA_MERGE_IMAGE=mfdz/onebusaway-gtfs-merge-cli:4.0.1-SNAPSHOT GTFSTIDY_IMAGE=derhuerst/gtfstidy OSMOSIS_IMAGE=mfdz/osmosis:0.47-1-gd370b8c4 PYOSMIUM_IMAGE=mfdz/pyosmium @@ -39,9 +40,9 @@ gtfs : data/www/index.html $(MERGED_WITH_FLEX:%=data/gtfs/%.merged.with_flex.gtf OSMIUM = docker run -i --rm -v $(HOST_MOUNT)/config/osm:$(TOOL_CFG) -v $(HOST_MOUNT)/data/osm:$(TOOL_DATA) mfdz/pyosmium osmium OSMIUM_UPDATE = docker run -i --rm -v $(HOST_MOUNT)/data/osm:$(TOOL_DATA) $(PYOSMIUM_IMAGE) pyosmium-up-to-date OSMOSIS = docker run -i --rm -v $(HOST_MOUNT)/config/osm:$(TOOL_CFG) -v $(HOST_MOUNT)/data/osm:$(TOOL_DATA) $(OSMOSIS_IMAGE) -TRANSFORM = docker run -i --rm -v $(HOST_MOUNT)/config/gtfs-rules:$(TOOL_CFG) -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA) $(OBA_IMAGE) java -Xmx20g -jar onebusaway-gtfs-transformer-cli.jar +TRANSFORM = docker run -i --rm -v $(HOST_MOUNT)/config/gtfs-rules:$(TOOL_CFG) -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA) -e JAVA_TOOL_OPTIONS="-Xmx20g" $(OBA_TRANSFORMER_IMAGE) PFAEDLE = docker run -i --rm -v $(HOST_MOUNT)/config:$(TOOL_CFG) -v $(HOST_MOUNT)/data/osm:$(TOOL_DATA)/osm -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA)/gtfs $(PFADLE_IMAGE) -MERGE = docker run -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA)/gtfs --rm $(OBA_IMAGE) java -Xmx18g -jar onebusaway-gtfs-merge-cli.jar --file=stops.txt --duplicateDetection=identity +MERGE = docker run -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA)/gtfs --rm -e JAVA_TOOL_OPTIONS="-Xmx18g" $(OBA_MERGE_IMAGE) --file=stops.txt --duplicateDetection=identity GTFSVTOR = docker run -i --rm -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA)/gtfs -v $(HOST_MOUNT)/data/www:$(TOOL_DATA)/www -e GTFSVTOR_OPTS=-Xmx8G $(GTFSVTOR_IMAGE) GTFSTIDY = docker run -i --rm -v $(HOST_MOUNT)/data/gtfs:$(TOOL_DATA)/gtfs $(GTFSTIDY_IMAGE)