Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM eclipse-temurin:25@sha256:3ab7fc8d0b4ade8fef96903fb36767c1dbb4fd1535dcfad85

# ca-certificates is listed so that the base image's copy is upgraded to the
# latest Ubuntu release, which carries CA distrusts such as the eMudhra one.
RUN apt-get update && apt-get install --yes ca-certificates jq wget curl zip unzip git python3 python3-pip autoconf automake libtool build-essential libtool make g++
RUN apt-get update && apt-get upgrade --yes && apt-get install --yes ca-certificates jq wget curl zip unzip git python3 python3-pip autoconf automake libtool build-essential libtool make g++ && rm -rf /var/lib/apt/lists/*

WORKDIR /workdir

Expand All @@ -12,7 +12,6 @@ RUN ./docker-setup.sh

ENV PATH=/opt/maven/bin:${PATH}
ENV PATH=/opt/gradle/bin:${PATH}
ENV PATH=/root/.local/share/coursier/bin:${PATH}

# The trust store is generated by docker-setup.sh. Setting it here also covers
# JDKs that coursier downloads at runtime, e.g. for `"jvm": "11"`.
Expand All @@ -21,7 +20,7 @@ RUN git config --global --add safe.directory *

COPY . .

RUN gradle --no-daemon :scip-java:installDist && mkdir -p /app/scip-java && cp -R scip-java/build/install/scip-java/. /app/scip-java/
RUN gradle --no-daemon :scip-java:installDist && mkdir -p /app/scip-java && cp -R scip-java/build/install/scip-java/. /app/scip-java/ && rm -rf /root/.gradle

COPY ./bin/scip-java-docker-script.sh /usr/bin/scip-java

Expand Down
10 changes: 4 additions & 6 deletions bin/docker-setup.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
#!/usr/bin/env bash
set -eux
curl -fLo /usr/local/bin/cs https://github.com/coursier/coursier/releases/download/v2.1.5/coursier
# Use the upstream JVM launcher so the configured system trust store applies.
curl -fLo /usr/local/bin/cs https://github.com/coursier/coursier/releases/download/v2.1.26/coursier
chmod +x /usr/local/bin/cs
ln -sf /usr/local/bin/cs /usr/local/bin/coursier
# Only install the JVM launcher. The native `cs` app embeds the trust store of
# the GraalVM it was built with, so it ignores the trust store set up below.
cs setup --yes --apps coursier

curl -fLo maven.zip https://archive.apache.org/dist/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip
curl -fLo maven.zip https://archive.apache.org/dist/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.zip
unzip -d /opt/maven maven.zip
rm maven.zip
mv /opt/maven/*/* /opt/maven

curl -fLo gradle.zip https://services.gradle.org/distributions/gradle-9.4.1-bin.zip
curl -fLo gradle.zip https://services.gradle.org/distributions/gradle-9.8.2-bin.zip
unzip -d /opt/gradle gradle.zip
rm gradle.zip
mv /opt/gradle/*/* /opt/gradle
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[versions]
clikt = "5.1.0"
gradle-api = "8.11.1"
guava = "33.7.2-jre"
junit-jupiter = "5.11.4"
kctfork = "0.14.0"
kotest = "6.2.6"
Expand All @@ -21,6 +22,7 @@ vanniktech-maven-publish = "0.37.0"
clikt-jvm = { module = "com.github.ajalt.clikt:clikt-jvm", version.ref = "clikt" }
gradle-api = { module = "dev.gradleplugins:gradle-api", version.ref = "gradle-api" }
gradle-test-kit = { module = "dev.gradleplugins:gradle-test-kit", version.ref = "gradle-api" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
kctfork-core = { module = "dev.zacsweers.kctfork:core", version.ref = "kctfork" }
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
Expand Down
5 changes: 5 additions & 0 deletions scip-shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@ description = "Shared SCIP utilities used by scip-java compiler plugins"

dependencies {
api(libs.scip.java.bindings)
constraints {
api(libs.guava) {
because("CVE-2026-102554")
}
}
}
Loading