update dejava font package name

try 17 jre jammy docker image
use eclipse-temurin containers from adoptium
2024-03-04 09:32:39 +05:30 · 2024-03-04 09:27:07 +05:30 · 2024-03-04 09:12:57 +05:30 · 2024-03-04 08:32:35 +05:30 · 2024-03-04 08:27:44 +05:30 · 2024-03-04 08:27:14 +05:30
5 changed files with 11 additions and 11 deletions
--- a/8
+++ b/8
@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk17:latest AS base-builder
+FROM eclipse-temurin:17-jre-jammy AS base-builder
 ARG SBT_VERSION=1.7.1
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
 ENV PATH=$PATH:${JAVA_HOME}/bin
@ -23,15 +23,15 @@ FROM sbt-builder as builder
 COPY src/ src/
 RUN sbt assembly

-FROM adoptopenjdk/openjdk16:jre  AS base-core
+FROM eclipse-temurin:17-jre-jammy  AS base-core
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
-RUN apt update && apt install -y ttf-dejavu
+RUN apt update && apt install -y fonts-dejavu
 ENV PATH=$PATH:${JAVA_HOME}/bin


 FROM base-core
 WORKDIR /lc-core
-COPY --from=builder /build/target/scala-3.3.1/LibreCaptcha.jar .
+COPY --from=builder /build/target/scala-3.3.3/LibreCaptcha.jar .
 RUN mkdir data/

 EXPOSE 8888
--- a/Runner.Dockerfile
+++ b/Runner.Dockerfile
@ -1,12 +1,12 @@
-FROM adoptopenjdk/openjdk17:latest  AS base-core
+FROM eclipse-temurin:17-jre-jammy  AS base-core
 ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
-RUN apt update && apt install -y ttf-dejavu
+RUN apt update && apt install -y fonts-dejavu
 ENV PATH=$PATH:${JAVA_HOME}/bin


 FROM base-core
 RUN mkdir /lc-core
-COPY target/scala-3.3.1/LibreCaptcha.jar /lc-core
+COPY target/scala-3.3.3/LibreCaptcha.jar /lc-core
 WORKDIR /lc-core
 RUN mkdir data/

--- a/build.sbt
+++ b/build.sbt
@ -2,7 +2,7 @@ lazy val root = (project in file(".")).settings(
  inThisBuild(
    List(
      organization := "com.example",
-      scalaVersion := "3.3.1",
+      scalaVersion := "3.3.3",
      version := "0.2.1-snapshot",
      semanticdbEnabled := true,
      semanticdbVersion := scalafixSemanticdb.revision
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@ -1,4 +1,4 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
--- a/tests/run.sh
+++ b/tests/run.sh
@ -4,7 +4,7 @@ python3 -m venv testEnv
 source ./testEnv/bin/activate
 pip install locust
 mkdir -p data/
-java -jar target/scala-3.3.1/LibreCaptcha.jar &
+java -jar target/scala-3.3.3/LibreCaptcha.jar &
 JAVA_PID=$!
 sleep 4

@ -22,7 +22,7 @@ echo Run functional test
 cp data/config.json data/config.json.bak
 cp tests/debug-config.json data/config.json

-java -jar target/scala-3.3.1/LibreCaptcha.jar &
+java -jar target/scala-3.3.3/LibreCaptcha.jar &
 JAVA_PID=$!
 sleep 4
Author	SHA1	Message	Date
hrj	4c3a7ad0fa	update dejava font package name	2024-03-04 09:32:39 +05:30
hrj	7f70d60dbb	try 17 jre jammy docker image	2024-03-04 09:27:07 +05:30
hrj	4d79567227	use eclipse-temurin containers from adoptium	2024-03-04 09:12:57 +05:30
hrj	f6b7278ed1	update scripts to scala 3.3.3	2024-03-04 08:32:35 +05:30
hrj	984bbacb69	Merge pull request #233 from scala-steward/update/scala3-library-3.3.3 Update scala3-library to 3.3.3	2024-03-04 08:27:44 +05:30
hrj	0dd00f5d3e	Merge pull request #232 from scala-steward/update/sbt-scalafix-0.12.0 Update sbt-scalafix to 0.12.0	2024-03-04 08:27:14 +05:30
Scala Steward	d355333bd4	Update scala3-library to 3.3.3	2024-03-02 18:55:20 +00:00
Scala Steward	55064c8532	Update sbt-scalafix to 0.12.0	2024-03-02 18:55:14 +00:00