diff --git a/Dockerfile b/Dockerfile index 03b290a..a8f026f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Set to noninteractive mode ARG DEBIAN_FRONTEND=noninteractive @@ -10,14 +10,11 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -yqq install git lsb-release sudo vim gnupg openjdk-17-jdk verilator curl make gcc g++ ################################################################################ -# Install sbt (https://www.scala-sbt.org/) +# Install scala and sbt (https://www.scala-sbt.org/) ################################################################################ -RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list -RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list -RUN curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add -RUN apt-get update -RUN apt-get -yqq install sbt +RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup --yes +ENV PATH="$PATH:/root/.local/share/coursier/bin" ################################################################################ # Install GNU RISC-V toolchain diff --git a/build.sbt b/build.sbt index f108a03..1d4d835 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "Proteus" version := "0.1" scalaVersion := "2.11.12" -val spinalVersion = "1.9.3" +val spinalVersion = "1.10.2a" fork := true