Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mises à jour des outils #18

Merged
merged 7 commits into from
Sep 26, 2022
Merged

Mises à jour des outils #18

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20d156c
Bump up gtfs-to-geojson
thbar Sep 26, 2022
47bc60c
Bump up transport-validator
thbar Sep 26, 2022
9260d3e
Bump up transit_model for netex conversion
thbar Sep 26, 2022
c978ec0
Bump GTFS validator to latest (breaking - name change)
thbar Sep 26, 2022
f9144b3
Reference latest GTFS-RT validator (#17)
thbar Sep 26, 2022
49c4275
Fix incorrect path
thbar Sep 26, 2022
2b0fc9f
Fix path
thbar Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -53,13 +53,13 @@ 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-3.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
Expand All @@ -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-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)
Expand Down