From 9f47f4070fa38c034aa4ed5ca3dccabea1176468 Mon Sep 17 00:00:00 2001 From: Iliyan Dimitrov <18351905+IliyanID@users.noreply.github.com> Date: Wed, 22 Mar 2023 12:39:56 -0600 Subject: [PATCH] Fixed null server --- Back-End/src/main/java/com/tco/Server/Server.java | 2 +- Docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Back-End/src/main/java/com/tco/Server/Server.java b/Back-End/src/main/java/com/tco/Server/Server.java index e92cdd8..da01447 100644 --- a/Back-End/src/main/java/com/tco/Server/Server.java +++ b/Back-End/src/main/java/com/tco/Server/Server.java @@ -37,7 +37,7 @@ public Server() } private void configureRestfulApiServer() { - int port = Integer.parseInt( System.getenv("PORT")); + int port = Integer.parseInt( System.getenv("PORT")!=null?System.getenv("PORT"):"-1"); if(!(port > 0)){ port = 3000; } diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 210ab8e..3552162 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -7,7 +7,7 @@ RUN apk add git RUN apk add maven RUN apk add openjdk8-jre RUN npm install -g npm@6.14.15 -RUN git clone https://github.com/IliyanID/Lindi-Bracelets.git +RUN git clone https://github.com/IliyanID/Lindi-Bracelets.git && echo "no cache" RUN cd /Lindi-Bracelets/Front-End && npm install && npm run build RUN cp -r /Lindi-Bracelets/Front-End/build /Lindi-Bracelets/Back-End/src/main/resources/public RUN cd /Lindi-Bracelets/Back-End && mvn -q package