-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #663 from kbase/compile_and_run_java_11
Migrate to Java 11
- Loading branch information
Showing
12 changed files
with
331 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,7 @@ | ||
| #!/bin/sh | ||
| # | ||
|
|
||
| CATALINA_HOME=/usr/share/tomcat8 | ||
|
|
||
| # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not | ||
| # defined in $DEFAULT) | ||
| JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/jre-8-oracle-x64" | ||
|
|
||
| # Look for the right JVM to use | ||
| for jdir in $JDK_DIRS; do | ||
| if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then | ||
| JAVA_HOME_TMP="$jdir" | ||
| # checks for a real JDK like environment, needed to check if | ||
| # really the java-gcj-compat-dev package is installed | ||
| if [ -r "$jdir/bin/jdb" ]; then | ||
| JAVA_HOME="$JAVA_HOME_TMP" | ||
| fi | ||
| fi | ||
| done | ||
|
|
||
| # Default Java options | ||
| if [ -z "$JAVA_OPTS" ]; then | ||
| JAVA_OPTS="-Djava.awt.headless=true -server \ | ||
| -Xms{{ default .Env.min_memory "1000" }}m -Xmx{{ default .Env.max_memory "3000" }}m \ | ||
| -XX:+UseG1GC" | ||
| fi | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| version: '3.4' | ||
|
|
||
| services: | ||
| workspace: | ||
| # build the workspace docker image locally | ||
| build: . | ||
| # to use the latest docker image from ghcr.io (see the readme file for more details), | ||
| # uncomment the next line and comment out the build line | ||
| # image: ghcr.io/kbase/workspace_deluxe:latest | ||
| ports: | ||
| - "7058:7058" | ||
| depends_on: ["auth2"] | ||
| environment: | ||
| - ignore_handle_service=true | ||
| - backend_type=GridFS | ||
| - mongodb_host=ci-mongo:27017 | ||
| - mongodb_user= | ||
| - auth2_service=http://auth2:8080/testmode/ | ||
| - listeners= | ||
| command: | ||
| - "-wait" | ||
| - "tcp://auth2:8080" | ||
| - "-template" | ||
| - "/kb/deployment/conf/.templates/deployment.cfg.templ:/kb/deployment/conf/deployment.cfg" | ||
| - "-template" | ||
| - "/kb/deployment/conf/.templates/server.xml.templ:/kb/deployment/services/workspace/tomcat/conf/server.xml" | ||
| - "-template" | ||
| - "/kb/deployment/conf/.templates/tomcat-users.xml.templ:/kb/deployment/services/workspace/tomcat/conf/tomcat-users.xml" | ||
| - "-template" | ||
| - "/kb/deployment/conf/.templates/logging.properties.templ:/kb/deployment/services/workspace/tomcat/conf/logging.properties" | ||
| - "-template" | ||
| - "/kb/deployment/conf/.templates/setenv.sh.templ:/kb/deployment/services/workspace/tomcat/bin/setenv.sh" | ||
| - "-stdout" | ||
| - "/kb/deployment/services/workspace/tomcat/logs/catalina.out" | ||
| - "-stdout" | ||
| - "/kb/deployment/services/workspace/tomcat/logs/access.log" | ||
| - "/usr/share/tomcat8/bin/catalina.sh" | ||
| - "run" | ||
|
|
||
| auth2: | ||
| image: ghcr.io/kbase/auth2:latest | ||
| ports: | ||
| - "8080:8080" | ||
| environment: | ||
| - KB_DEPLOYMENT_CONFIG=/kb/deployment/conf/deployment.cfg | ||
| - test_mode_enabled=true | ||
| command: | ||
| - "-wait" | ||
| - "tcp://ci-mongo:27017" | ||
| - "-timeout" | ||
| - "120s" | ||
| - "-template" | ||
| - "/kb/deployment/conf/.templates/deployment.cfg.templ:/kb/deployment/conf/deployment.cfg" | ||
| - "/kb/deployment/bin/start_auth2.sh" | ||
| depends_on: ["ci-mongo"] | ||
|
|
||
| ci-mongo: | ||
| image: "mongo:3.6.23" | ||
| ports: | ||
| - "27017:27017" |
Oops, something went wrong.