From 9e3d84ac44ad6891df77a822ce513374af86723f Mon Sep 17 00:00:00 2001 From: Jonathan Cole Date: Sat, 25 Nov 2023 09:23:54 -0500 Subject: [PATCH] remove bsp file, update dev dockerfile --- .bsp/sbt.json | 1 - .gitignore | 2 ++ Dockerfile.build | 10 +++++----- project/build.properties | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .bsp/sbt.json diff --git a/.bsp/sbt.json b/.bsp/sbt.json deleted file mode 100644 index 2143a223..00000000 --- a/.bsp/sbt.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"sbt","version":"1.9.7","bspVersion":"2.1.0-M1","languages":["scala"],"argv":["/usr/lib/jvm/java-17-amazon-corretto/bin/java","-Xms100m","-Xmx100m","-classpath","/home/jcole/.cache/sbt/boot/sbt-launch/1.9.7/sbt-launch-1.9.7.jar","-Dsbt.script=/usr/bin/sbt","xsbt.boot.Boot","-bsp"]} \ No newline at end of file diff --git a/.gitignore b/.gitignore index e1941ad1..fa04f136 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ conf/routes npm-debug.log start.sh + +.bsp/sbt.json diff --git a/Dockerfile.build b/Dockerfile.build index d3662a5b..b240b264 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -2,10 +2,10 @@ FROM eclipse-temurin:17-jdk-focal WORKDIR /app COPY src.tar /app/ RUN tar -zxf /app/src.tar -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 install sbt +RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list +RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list +RUN curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add +RUN sudo apt-get update +RUN sudo apt-get install sbt RUN cd /app && sbt compile CMD cd /app && sbt run diff --git a/project/build.properties b/project/build.properties index ad9a8d4d..494d5f20 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,4 +2,4 @@ #Tue Oct 04 16:50:56 CDT 2016 template.uuid=82948ff9-9860-41c3-b22c-da63623499e5 # rel 22 oct 2023 -sbt.version=1.9.7 +sbt.version=1.9.7