diff --git a/README.md b/README.md index 0f4db12..d9289ab 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Don't forget to have Docker installed for Windows. There is an `env-default-windows` file you should rename to `.env` before running the build script. -The `docker/docker-builder` file has a line commented out for Windows users. +The `docker/docker-builder` file has a line commented out for Windows users, and a line that needs to be commented out. ### MAC diff --git a/build.sh b/build.sh index 3d880e9..225f8f1 100644 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ then fi #Needed for Linux builds -chmod a+x "${HOME_DIR}/docker/scripts/*" +chmod a+x ./docker/scripts/* docker build -t reso-builder -f docker/docker-builder . docker run --name builder --mount type=bind,source="${HOME_DIR}",target=/usr/src/app -t reso-builder diff --git a/docker/docker-builder b/docker/docker-builder index efad245..36e23dc 100644 --- a/docker/docker-builder +++ b/docker/docker-builder @@ -1,10 +1,11 @@ FROM ubuntu:20.10 WORKDIR /usr/src/app +# Comment next line out for Windows builds ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y wget openjdk-8-jdk curl pip maven docker-compose # Needed for Windows builds #RUN update-java-alternatives -s java-1.8.0-openjdk-amd64 -CMD ./docker/scripts/build.sh +CMD sh /usr/src/app/docker/scripts/build.sh diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh index 2508763..9ed5cc6 100644 --- a/docker/scripts/build.sh +++ b/docker/scripts/build.sh @@ -1,8 +1,7 @@ #!/bin/bash -REAL_VAR0=`readlink -f $0` -HOME_DIR_OLD=`dirname ${REAL_VAR0}` HOME_DIR=/usr/src/app +cd "${HOME_DIR}" TEMP_DIR="${HOME_DIR}/temp" SQL_DIR="${HOME_DIR}/sql" diff --git a/src/main/java/org/reso/service/data/meta/builder/DefinitionBuilder.java b/src/main/java/org/reso/service/data/meta/builder/DefinitionBuilder.java index 9b47fc2..aded50e 100644 --- a/src/main/java/org/reso/service/data/meta/builder/DefinitionBuilder.java +++ b/src/main/java/org/reso/service/data/meta/builder/DefinitionBuilder.java @@ -12,6 +12,10 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.reso.service.servlet.RESOservlet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class DefinitionBuilder { @@ -31,6 +35,8 @@ public class DefinitionBuilder new AbstractMap.SimpleEntry<>("version", true)) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + private static final Logger LOG = LoggerFactory.getLogger(DefinitionBuilder.class); + // Internals private final String fileName; private JsonReader reader; @@ -50,6 +56,7 @@ public class DefinitionBuilder } catch (FileNotFoundException e) { + LOG.info("ERROR:",e.getMessage()); e.printStackTrace(); } }