diff --git a/.dockerfiles/ort.Dockerfile b/.dockerfiles/ort.Dockerfile index 91ba12a..54a2358 100644 --- a/.dockerfiles/ort.Dockerfile +++ b/.dockerfiles/ort.Dockerfile @@ -4,7 +4,6 @@ FROM debian:bullseye ##################################################### # version the Dockerfile, so we can do release bump LABEL version="1.0.0" -ARG ORT_VERSION=12.0.0 USER root @@ -50,9 +49,18 @@ RUN rustup install stable && rustup default stable RUN cargo install cargo-license RUN cargo install get-license-helper -RUN wget -O ort.zip "https://github.com/oss-review-toolkit/ort/releases/download/$ORT_VERSION/ort-$ORT_VERSION.zip" -RUN unzip ort.zip -ENV PATH=/home/build/ort-$ORT_VERSION/bin:$PATH +ARG ORT_VERSION=15.1.0 + +RUN git clone https://github.com/oss-review-toolkit/ort +WORKDIR /home/build/ort +RUN git checkout "$ORT_VERSION" +RUN git submodule update --init --recursive +RUN ./gradlew installDist + +## ORT Binary install - requires Java 17+, which causes issues with some of our v2 projects (Java 11) +# RUN wget -O ort.zip "https://github.com/oss-review-toolkit/ort/releases/download/$ORT_VERSION/ort-$ORT_VERSION.zip" +# RUN unzip ort.zip +ENV PATH=/home/build/ort/cli/build/install/ort/bin:$PATH WORKDIR /home/build