Skip to content

Commit 654950a

Browse files
authored
Fix - install ps, which is necessary for starting Bloop (#2332)
* Fix - remove backslash which causes `RUN` to be passed as an argument to scala-cli * Fix - install `ps`, which is necessary for starting Bloop. * Increase timeout for bloop startup
1 parent 085006e commit 654950a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/scripts/docker/ScalaCliDockerFile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM debian:stable-slim
2-
RUN apt update && apt install build-essential libz-dev clang -y
2+
RUN apt update && apt install build-essential libz-dev clang procps -y
33
ADD scala-cli /usr/bin/
44
RUN \
55
echo "println(1)" | scala-cli -S 3 - -v -v -v && \
66
echo "println(1)" | scala-cli -S 2.13 - -v -v -v && \
7-
echo "println(1)" | scala-cli -S 2.12 - -v -v -v \
7+
echo "println(1)" | scala-cli -S 2.12 - -v -v -v
88
RUN \
99
echo "println(1)" | scala-cli --power package --native _.sc --force && \
1010
echo "println(1)" | scala-cli --power package --native-image _.sc --force

modules/integration/docker/src/test/scala/scala/cli/integration/RunDockerTests.scala

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ class RunDockerTests extends munit.FunSuite {
1313
lazy val termOpt = if (System.console() == null) Nil else Seq("-t")
1414
lazy val ciOpt = Option(System.getenv("CI")).map(v => Seq("-e", s"CI=$v")).getOrElse(Nil)
1515
lazy val slimScalaCliImage = "scala-cli-slim"
16+
val extraOptions: List[String] = List(
17+
"--bloop-startup-timeout",
18+
"2min",
19+
"--bloop-bsp-timeout",
20+
"1min"
21+
)
1622

1723
test("run simple app in in docker") {
1824
val fileName = "simple.sc"
@@ -28,7 +34,7 @@ class RunDockerTests extends munit.FunSuite {
2834
val cmd = Seq[os.Shellable](
2935
// format: off
3036
"docker", "run", "--rm", termOpt, "-v", s"$root:/data", "-w", "/data", ciOpt,
31-
imageName, fileName
37+
imageName, fileName, extraOptions
3238
// format: on
3339
)
3440
os.proc(cmd).call(
@@ -54,7 +60,7 @@ class RunDockerTests extends munit.FunSuite {
5460
val cmdPackage = Seq[os.Shellable](
5561
// format: off
5662
"docker", "run", "--rm", termOpt, "-v", s"$root:/data", "-w", "/data", ciOpt,
57-
imageName, "--power", "package", "--native", fileName, "-o", "Hello"
63+
imageName, "--power", "package", "--native", fileName, "-o", "Hello", extraOptions
5864
// format: on
5965
)
6066
val procPackage = os.proc(cmdPackage).call(cwd = root, check = false)
@@ -70,7 +76,7 @@ class RunDockerTests extends munit.FunSuite {
7076
val cmdPackage = Seq[os.Shellable](
7177
// format: off
7278
"docker", "run", "--rm", termOpt, "-v", s"$root:/data", "-w", "/data", ciOpt,
73-
imageName, "--power", "package", "--native-image", fileName, "-o", "Hello"
79+
imageName, "--power", "package", "--native-image", fileName, "-o", "Hello", extraOptions
7480
// format: on
7581
)
7682
val procPackage = os.proc(cmdPackage).call(cwd = root, check = false)

0 commit comments

Comments
 (0)