Skip to content

Commit

Permalink
temurin 17
Browse files Browse the repository at this point in the history
  • Loading branch information
coleji committed Nov 25, 2023
1 parent 8aa4229 commit 438b8bb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
1 change: 0 additions & 1 deletion .bsp/sbt.json

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ conf/routes
npm-debug.log

start.sh

.bsp/sbt.json
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11
FROM eclipse-temurin:17-jdk-focal
RUN apt-get update
RUN apt-get install ssmtp -y
RUN mkdir /app
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM openjdk:11
FROM eclipse-temurin:17-jdk-focal
WORKDIR /app
COPY src.tar /app/
RUN tar -zxf /app/src.tar
RUN apt update
RUN apt install gnupg -y
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 apt-get install sbt -y
COPY src.tar /app/
RUN tar -zxf /app/src.tar
RUN cd /app && sbt compile
CMD cd /app && sbt run
2 changes: 2 additions & 0 deletions app/com/coleji/neptune/Core/Boot/ServerBootLoader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ object ServerBootLoader {
if (PermissionsAuthority.isBooted) PermissionsAuthority.PA
else {
println(" *************** BOOTING UP SERVER *************** ")
println(System.getProperty("java.vendor") + " - " + System.getProperty("java.version"))
println(System.getProperty("java.home"))

// Get server instance properties
val paramFile = new PropertiesWrapper("conf/private/server-properties", requiredProperties)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 438b8bb

Please sign in to comment.