Merge branch 'main' into feature/4292-ollama-based-recommender

* main: #4330 - Remove default memory limit for INCEpTION in Dockerfile #4229 - Better project template selection #4330 - Remove default memory limit for INCEpTION in Dockerfile #4229 - Better project template selection
inception-project · Dec 1, 2023 · ef92437 · ef92437
2 parents c42e406 + edde2be
commit ef92437
Show file tree

Hide file tree

Showing 12 changed files with 1,256 additions and 87 deletions.
diff --git a/inception/inception-doc/src/main/resources/META-INF/asciidoc/user-guide.adoc b/inception/inception-doc/src/main/resources/META-INF/asciidoc/user-guide.adoc
@@ -290,7 +290,7 @@ include::{include-dir}formats-webannotsv3.adoc[leveloffset=+2]
 
 include::{include-dir}formats-xml.adoc[leveloffset=+2]
 
-include::{include-dir}formats-xml-custom.adoc.adoc[leveloffset=+2]
+include::{include-dir}formats-xml-custom.adoc[leveloffset=+2]
 
 <<<
 

diff --git a/inception/inception-docker/src/main/docker/Dockerfile b/inception/inception-docker/src/main/docker/Dockerfile
@@ -50,5 +50,5 @@ VOLUME /tmp
 VOLUME /var/log
 
 # Launch application
-ENV JAVA_OPTS="-Xmx750m"
+ENV JAVA_OPTS="-XX:MaxRAMPercentage=80"
 CMD /opt/inception/launch.sh java ${JAVA_OPTS} -Djava.awt.headless=true -Dinception.home=/export -jar inception-app-standalone.jar
diff --git a/.../project/initializers/basic/thumbnail.svg → .../project/initializers/basic/thumbnail.svg b/.../project/initializers/basic/thumbnail.svg → .../project/initializers/basic/thumbnail.svg
diff --git a/...ct/initializers/doclabeling/thumbnail.svg → ...ct/initializers/doclabeling/thumbnail.svg b/...ct/initializers/doclabeling/thumbnail.svg → ...ct/initializers/doclabeling/thumbnail.svg
diff --git a/...itializers/sentencelabeling/thumbnail.svg → ...itializers/sentencelabeling/thumbnail.svg b/...itializers/sentencelabeling/thumbnail.svg → ...itializers/sentencelabeling/thumbnail.svg
diff --git a/...rc/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/thumbnail.svg b/...rc/main/java/de/tudarmstadt/ukp/inception/project/initializers/ud/thumbnail.svg
-Original file line number
+Diff line change
@@ Expand Up @@
     include::{include-dir}formats-xml.adoc[leveloffset=+2]
-    include::{include-dir}formats-xml-custom.adoc.adoc[leveloffset=+2]
+    include::{include-dir}formats-xml-custom.adoc[leveloffset=+2]
     <<<
@@ Expand Down @@