Ver código fonte

Update SNUnit and various dependencies (#6965)

- Use `nproc` output as number of processes to match the machine
Lorenzo Gabriele 3 anos atrás
pai
commit
21aee9cb1a

+ 1 - 1
frameworks/Scala/snunit/.dockerignore

@@ -3,7 +3,7 @@
 
 # Allow files and directories
 !/build.sbt
-!/config.json
+!/config.sh
 !/project/build.properties
 !/project/plugins.sbt
 !/src

+ 3 - 3
frameworks/Scala/snunit/build.sbt

@@ -1,12 +1,12 @@
 import scala.scalanative.build._
 
-scalaVersion := "2.13.4"
+scalaVersion := "2.13.7"
 
-val snunitVersion = "0.0.9"
+val snunitVersion = "0.0.11"
 libraryDependencies ++= Seq(
   "com.github.lolgab" %%% "snunit" % snunitVersion,
   "com.github.lolgab" %%% "snunit-async" % snunitVersion,
-  "com.lihaoyi" %%% "upickle" % "1.2.3"
+  "com.lihaoyi" %%% "upickle" % "1.4.2"
 )
 
 nativeConfig ~= {

+ 0 - 15
frameworks/Scala/snunit/config.json

@@ -1,15 +0,0 @@
-{
-  "listeners": {
-    "*:8080": {
-      "pass": "applications/example"
-    }
-  },
-  "applications": {
-    "example": {
-      "type": "external",
-      "working_directory": "/app",
-      "executable": "example",
-      "processes": 30
-    }
-  }
-}

+ 21 - 0
frameworks/Scala/snunit/config.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+config='{'
+config+='  "listeners": {'
+config+='    "*:8080": {'
+config+='      "pass": "applications/example"'
+config+='    }'
+config+='  },'
+config+='  "applications": {'
+config+='    "example": {'
+config+='      "type": "external",'
+config+='      "processes": '"$(nproc)"','
+config+='      "executable": "/app/example"'
+config+='    }'
+config+='  }'
+config+='}'
+
+curl -X PUT \
+     --data-binary "$config" \
+     --unix-socket /var/run/control.unit.sock \
+     http://localhost/config

+ 1 - 1
frameworks/Scala/snunit/project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.5.5

+ 1 - 1
frameworks/Scala/snunit/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2")

+ 6 - 6
frameworks/Scala/snunit/snunit.dockerfile

@@ -1,11 +1,11 @@
-FROM debian:buster as builder
+FROM debian:bullseye-slim as builder
 
 RUN apt-get update && apt-get install -y curl gnupg && \
-  echo "deb https://dl.bintray.com/sbt/debian /" > /etc/apt/sources.list.d/sbt.list && \
+  echo "deb https://repo.scala-sbt.org/scalasbt/debian /" > /etc/apt/sources.list.d/sbt.list && \
   curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add - && \
   curl -sL https://nginx.org/keys/nginx_signing.key | apt-key add - && \
-  echo "deb https://packages.nginx.org/unit/debian/ buster unit" > /etc/apt/sources.list.d/unit.list && \
-  echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list && \
+  echo "deb https://packages.nginx.org/unit/debian/ bullseye unit" > /etc/apt/sources.list.d/unit.list && \
+  echo "deb-src https://packages.nginx.org/unit/debian/ bullseye unit" >> /etc/apt/sources.list.d/unit.list && \
   apt-get update && apt-get install -y clang unit-dev libuv1-dev openjdk-11-jdk sbt && \
   apt-get purge -y gnupg
 
@@ -15,11 +15,11 @@ COPY . .
 
 RUN sbt nativeLink
 
-FROM nginx/unit:1.22.0-minimal
+FROM nginx/unit:1.26.1-minimal
 
 RUN apt-get update && apt-get install -y libuv1
 
-COPY /config.json /docker-entrypoint.d/
+COPY /config.sh /docker-entrypoint.d/
 COPY --from=builder /workdir/target/scala-2.13/workdir-out /app/example
 
 EXPOSE 8080