Skip to content

Commit

Permalink
Upgrade to oauth version of container core (#362)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmgaldi authored Mar 8, 2024
1 parent 89d5a1b commit 906f87c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG GITHUB_TOKEN
WORKDIR /workspace

RUN jlink --compress=2 --module-path /opt/jdk/jmods \
--add-modules java.base,java.net.http,java.security.jgss,java.logging,java.xml,java.desktop,java.management,jdk.management,java.sql,java.naming \
--add-modules java.base,java.net.http,java.security.jgss,java.logging,java.xml,java.desktop,java.management,jdk.management,java.sql,java.naming,jdk.crypto.ec \
--output /jlinked \
&& apk add --no-cache git sed findutils coreutils make npm curl gawk jq \
&& git config --global advice.detachedHead false
Expand Down Expand Up @@ -65,6 +65,7 @@ ENV JAVA_HOME=/opt/jdk \
JVM_ARGS=""

COPY --from=prep /jlinked /opt/jdk
COPY --from=prep /usr/lib/jvm/default-jvm/lib/security/cacerts /opt/jdk/lib/security/cacerts
COPY --from=prep /workspace/build/libs/service.jar /service.jar

CMD java -jar -XX:+CrashOnOutOfMemoryError $JVM_MEM_ARGS $JVM_ARGS /service.jar
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ repositories {
//

// versions
val coreLib = "6.19.1" // Container core lib version
val edaCompute = "2.6.0" // EDA Compute version (used to pull in compute plugin RAML)
val coreLib = "7.0.1" // Container core lib version
val edaCompute = "2.6.1" // EDA Compute version (used to pull in compute plugin RAML)
val edaCommon = "11.7.2" // EDA Common version
val fgputil = "2.12.9-jakarta" // FgpUtil version
val fgputil = "2.13.1-jakarta" // FgpUtil version

// use local EDA compute compiled schema if project exists, else use released version;
// this mirrors the way we use local EdaCommon code if available
Expand Down

0 comments on commit 906f87c

Please sign in to comment.