diff --git a/Dockerfile b/Dockerfile index 70ca213..af7106e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ # docker run --platform linux/arm64/v8 --entrypoint /bin/bash -it -p 5900:5900 beastfx_testing -FROM openjdk:8 +FROM eclipse-temurin:8-jdk RUN apt-get update # Install stuff required later @@ -32,7 +32,7 @@ RUN apt-get install -y curl git ARG DEBIAN_FRONTEND=noninteractive -ENV USER root +ENV USER=root WORKDIR /root/BeastFX @@ -84,7 +84,7 @@ RUN chmod 600 /root/.vnc/passwd ADD . ./ -ENV DISPLAY :2 +ENV DISPLAY=:2 RUN echo "#!/bin/bash\n" \ "export USER=root\n" \ diff --git a/src/beastfx/app/treeannotator/TAGui.java b/src/beastfx/app/treeannotator/TAGui.java index 0af119c..8213d09 100644 --- a/src/beastfx/app/treeannotator/TAGui.java +++ b/src/beastfx/app/treeannotator/TAGui.java @@ -128,15 +128,15 @@ public void run() { TreeAnnotator ta = new TreeAnnotator(); ta.topologyInput.setValue(targetOption, ta); ta.heightInput.setValue(heightsOption, ta); - ta.run(burninPercentage, + ta.targetInput.setValue(targetTreeFileName, ta); + + ta.run(burninPercentage, lowMem, - //heightsOption, posteriorLimit, hpd2D, - //targetOption, - targetTreeFileName, inputFileName, - outputFileName); + outputFileName + ); } catch (Exception ex) { Log.err.println("Exception: " + ex.getMessage());