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

Update SNUnuit NGINX Unit and try to fix startup errors #9522

Merged
merged 2 commits into from
Jan 13, 2025
Merged

Update SNUnuit NGINX Unit and try to fix startup errors #9522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ef830
Update SNUnuit NGINX Unit and try to fix startup errors
lolgab Jan 12, 2025
cae09e6
Try remove the `broken` tag
lolgab Jan 12, 2025
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
2 changes: 1 addition & 1 deletion frameworks/Scala/snunit/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Allow files and directories
!/build.sbt
!/config.sh
!/conf.json
!/project/build.properties
!/project/plugins.sbt
!/src
3 changes: 1 addition & 2 deletions frameworks/Scala/snunit/benchmark_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"database_os": "Linux",
"display_name": "SNUnit",
"notes": "",
"versus": "",
"tags": ["broken"]
"versus": ""
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions frameworks/Scala/snunit/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import scala.scalanative.build._

scalaVersion := "3.5.2"

val snunitVersion = "0.10.2"
val jsoniterScalaVersion = "2.31.3"
val snunitVersion = "0.10.3"
val jsoniterScalaVersion = "2.33.0"

libraryDependencies ++= Seq(
"com.github.lolgab" %%% "snunit" % snunitVersion,
Expand Down
20 changes: 20 additions & 0 deletions frameworks/Scala/snunit/conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"listeners": {
"*:8080": {
"pass": "applications/example"
}
},
"applications": {
"example": {
"type": "external",
"processes": {
"spare": 2,
"max": 20
},
"executable": "/app/example",
"environment": {
"SCALANATIVE_GC_THREADS": "2"
}
}
}
}
26 changes: 0 additions & 26 deletions frameworks/Scala/snunit/config.sh
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions frameworks/Scala/snunit/snunit.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,25 @@ RUN apt-get update && apt-get install -y curl gnupg && \
curl -sL https://nginx.org/keys/nginx_signing.key | apt-key add - && \
echo "deb https://packages.nginx.org/unit/debian/ bookworm unit" > /etc/apt/sources.list.d/unit.list && \
echo "deb-src https://packages.nginx.org/unit/debian/ bookworm unit" >> /etc/apt/sources.list.d/unit.list && \
apt-get update && apt-get install -y clang unit-dev=1.33* openjdk-17-jdk sbt=1.10.5 && \
apt-get update && apt-get install -y clang unit-dev=1.34* openjdk-17-jdk sbt=1.10.5 && \
apt-get purge -y gnupg

WORKDIR /workdir

RUN sbt version

COPY . .

RUN sbt nativeLink

FROM unit:1.33.0-minimal
FROM unit:1.34.0-minimal

WORKDIR /workdir

COPY /config.sh /docker-entrypoint.d/
COPY conf.json statedir/
COPY --from=builder /usr/sbin/unitd /usr/sbin/unitd
COPY --from=builder /workdir/target/scala-3.5.2/workdir /app/example

EXPOSE 8080

ENTRYPOINT [ "unitd", "--no-daemon", "--statedir", "/workdir/statedir", "--log", "/dev/stdout" ]
Loading