Skip to content

Commit db4831a

Browse files
authored
Update SNUnuit NGINX Unit and try to fix startup errors (#9522)
* Update SNUnuit NGINX Unit and try to fix startup errors * Try remove the `broken` tag
1 parent 0516670 commit db4831a

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

frameworks/Scala/snunit/.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# Allow files and directories
55
!/build.sbt
6-
!/config.sh
6+
!/conf.json
77
!/project/build.properties
88
!/project/plugins.sbt
99
!/src

frameworks/Scala/snunit/benchmark_config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
"database_os": "Linux",
2020
"display_name": "SNUnit",
2121
"notes": "",
22-
"versus": "",
23-
"tags": ["broken"]
22+
"versus": ""
2423
}
2524
}
2625
]

frameworks/Scala/snunit/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import scala.scalanative.build._
22

33
scalaVersion := "3.5.2"
44

5-
val snunitVersion = "0.10.2"
6-
val jsoniterScalaVersion = "2.31.3"
5+
val snunitVersion = "0.10.3"
6+
val jsoniterScalaVersion = "2.33.0"
77

88
libraryDependencies ++= Seq(
99
"com.github.lolgab" %%% "snunit" % snunitVersion,

frameworks/Scala/snunit/conf.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"listeners": {
3+
"*:8080": {
4+
"pass": "applications/example"
5+
}
6+
},
7+
"applications": {
8+
"example": {
9+
"type": "external",
10+
"processes": {
11+
"spare": 2,
12+
"max": 20
13+
},
14+
"executable": "/app/example",
15+
"environment": {
16+
"SCALANATIVE_GC_THREADS": "2"
17+
}
18+
}
19+
}
20+
}

frameworks/Scala/snunit/config.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

frameworks/Scala/snunit/snunit.dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,25 @@ RUN apt-get update && apt-get install -y curl gnupg && \
66
curl -sL https://nginx.org/keys/nginx_signing.key | apt-key add - && \
77
echo "deb https://packages.nginx.org/unit/debian/ bookworm unit" > /etc/apt/sources.list.d/unit.list && \
88
echo "deb-src https://packages.nginx.org/unit/debian/ bookworm unit" >> /etc/apt/sources.list.d/unit.list && \
9-
apt-get update && apt-get install -y clang unit-dev=1.33* openjdk-17-jdk sbt=1.10.5 && \
9+
apt-get update && apt-get install -y clang unit-dev=1.34* openjdk-17-jdk sbt=1.10.5 && \
1010
apt-get purge -y gnupg
1111

1212
WORKDIR /workdir
1313

14+
RUN sbt version
15+
1416
COPY . .
1517

1618
RUN sbt nativeLink
1719

18-
FROM unit:1.33.0-minimal
20+
FROM unit:1.34.0-minimal
21+
22+
WORKDIR /workdir
1923

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

2328
EXPOSE 8080
29+
30+
ENTRYPOINT [ "unitd", "--no-daemon", "--statedir", "/workdir/statedir", "--log", "/dev/stdout" ]

0 commit comments

Comments
 (0)