From 20d156c7537e18ff5f3a2816696f58baaae4cd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 10:38:25 +0200 Subject: [PATCH 1/7] Bump up gtfs-to-geojson --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 854e65b..30decce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM rust:latest as builder WORKDIR / # this repo has no tagged releases ; we pin the version based on latest verified commit instead RUN git clone https://github.com/rust-transit/gtfs-to-geojson.git -RUN git -C gtfs-to-geojson checkout 3f21e496e433704cf879ee453eaa4cb41cf06e7c +RUN git -C gtfs-to-geojson checkout 6ee7dd5908babb79877df5673b0768bb01e1559d WORKDIR /gtfs-to-geojson RUN cargo build --release RUN strip ./target/release/gtfs-geojson From 47bc60c3cec32d049b67a09418c22ef240a4d5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 10:38:41 +0200 Subject: [PATCH 2/7] Bump up transport-validator --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 30decce..b4c28ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN strip ./target/release/gtfs-geojson WORKDIR / # this repo has no tagged releases ; we pin the version based on latest verified commit instead RUN git clone https://github.com/etalab/transport-validator.git -RUN git -C transport-validator checkout 302e62e787dc28b80f9e8e80ceadc80be71aafbc +RUN git -C transport-validator checkout 4f985748eea742bb077327f8463f9bbc5e13cb1c WORKDIR /transport-validator RUN cargo build --release RUN strip ./target/release/main From 9260d3eb091133cbe50d1b6266c7d2a4ad934bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 10:38:51 +0200 Subject: [PATCH 3/7] Bump up transit_model for netex conversion --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4c28ce..2ceafad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN strip ./target/release/main FROM kisiodigital/rust-ci:latest-proj8.1.0 as builder_proj WORKDIR / # we pin the version to avoid unexpected changes due to rebuild on our side -RUN git clone --depth=1 --branch=v0.46.0 --single-branch https://github.com/CanalTP/transit_model +RUN git clone --depth=1 --branch=v0.51.2 --single-branch https://github.com/CanalTP/transit_model WORKDIR /transit_model # NOTE: when using the kisio rust-ci as a base image, CARGO_TARGET_DIR is set to something like `/tmp/cargo-release`. # To avoid breaking the build in case of variable change upstream, we instead force the build to be local, which From c978ec0689a107a59354032257345b4105646790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 13:38:37 +0200 Subject: [PATCH 4/7] Bump GTFS validator to latest (breaking - name change) --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ceafad..1c79841 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev default-jre cur # https://github.com/MobilityData/gtfs-validator (java app) # https://github.com/MobilityData/gtfs-validator/releases -RUN curl --location -O https://github.com/MobilityData/gtfs-validator/releases/download/v3.0.0/gtfs-validator-v3.0.0_cli.jar -RUN cp gtfs-validator-v3.0.0_cli.jar /usr/local/bin +RUN curl --location -O https://github.com/MobilityData/gtfs-validator/releases/download/v3.1.1/gtfs-validator-3.1.1-cli.jar +RUN cp gtfs-validator-v3.1.1_cli.jar /usr/local/bin # https://github.com/CUTR-at-USF/gtfs-realtime-validator/blob/master/gtfs-realtime-validator-lib/README.md#batch-processing (java app) # freeze by commit + self-compile for now (https://github.com/CUTR-at-USF/gtfs-realtime-validator/issues/406) @@ -81,7 +81,7 @@ RUN /usr/local/bin/transport-validator --help RUN /usr/local/bin/gtfs2netexfr --help # the --help returns a non-zero exit code ; we grep on a well-known text as a quick test -RUN java -jar /usr/local/bin/gtfs-validator-v3.0.0_cli.jar --help | grep "Location of the input GTFS ZIP" +RUN java -jar /usr/local/bin/gtfs-validator-v3.1.1_cli.jar --help | grep "Location of the input GTFS ZIP" # there is no --version or --help here currently RUN java -jar /usr/local/bin/gtfs-realtime-validator-lib-1.0.0-SNAPSHOT.jar 2>&1 | grep "For batch mode you must provide a path and file name to GTFS data" # freeze the JDK too (installed via default-jre, so no explicit version) From f9144b3064ce506fc1b35b8da26e2c73fa16e773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 13:39:27 +0200 Subject: [PATCH 5/7] Reference latest GTFS-RT validator (#17) --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c79841..e5bfe73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,10 +56,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev default-jre cur RUN curl --location -O https://github.com/MobilityData/gtfs-validator/releases/download/v3.1.1/gtfs-validator-3.1.1-cli.jar RUN cp gtfs-validator-v3.1.1_cli.jar /usr/local/bin -# https://github.com/CUTR-at-USF/gtfs-realtime-validator/blob/master/gtfs-realtime-validator-lib/README.md#batch-processing (java app) -# freeze by commit + self-compile for now (https://github.com/CUTR-at-USF/gtfs-realtime-validator/issues/406) -RUN git clone https://github.com/CUTR-at-USF/gtfs-realtime-validator.git -RUN git -C gtfs-realtime-validator checkout fca9c73b3d3b377c606065648750b777d36ad553 +# https://github.com/MobilityData/gtfs-realtime-validator/blob/master/gtfs-realtime-validator-lib/README.md#batch-processing (java app) +# freeze by commit + self-compile for now (until https://github.com/MobilityData/gtfs-realtime-validator/issues/105 is handled) +RUN git clone https://github.com/MobilityData/gtfs-realtime-validator.git +RUN git -C gtfs-realtime-validator checkout f9472e33e3c4719311b354ef7bc747035d67b1a8 WORKDIR /gtfs-realtime-validator/gtfs-realtime-validator-lib RUN apt-get -y install maven RUN mvn package From 49c4275e8f9088016887f8c7418ee04c9c3b2db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 13:45:01 +0200 Subject: [PATCH 6/7] Fix incorrect path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5bfe73..eb8f25a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev default-jre cur # https://github.com/MobilityData/gtfs-validator (java app) # https://github.com/MobilityData/gtfs-validator/releases RUN curl --location -O https://github.com/MobilityData/gtfs-validator/releases/download/v3.1.1/gtfs-validator-3.1.1-cli.jar -RUN cp gtfs-validator-v3.1.1_cli.jar /usr/local/bin +RUN cp gtfs-validator-3.1.1-cli.jar /usr/local/bin # https://github.com/MobilityData/gtfs-realtime-validator/blob/master/gtfs-realtime-validator-lib/README.md#batch-processing (java app) # freeze by commit + self-compile for now (until https://github.com/MobilityData/gtfs-realtime-validator/issues/105 is handled) From 2b0fc9f1682faa8a0465faad9cab24813414e6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Mon, 26 Sep 2022 14:00:17 +0200 Subject: [PATCH 7/7] Fix path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb8f25a..ca55cf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,7 +81,7 @@ RUN /usr/local/bin/transport-validator --help RUN /usr/local/bin/gtfs2netexfr --help # the --help returns a non-zero exit code ; we grep on a well-known text as a quick test -RUN java -jar /usr/local/bin/gtfs-validator-v3.1.1_cli.jar --help | grep "Location of the input GTFS ZIP" +RUN java -jar /usr/local/bin/gtfs-validator-3.1.1-cli.jar --help | grep "Location of the input GTFS ZIP" # there is no --version or --help here currently RUN java -jar /usr/local/bin/gtfs-realtime-validator-lib-1.0.0-SNAPSHOT.jar 2>&1 | grep "For batch mode you must provide a path and file name to GTFS data" # freeze the JDK too (installed via default-jre, so no explicit version)