From d73d5cd7aa0371d68dd2b88a130f15971d364c11 Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Mon, 12 Apr 2021 17:24:31 +0200 Subject: [PATCH 1/2] Add the prometheus and remove useless stuff. --- tomcat9/image.yaml | 7 ++ tomcat9/image_jdk11.yaml | 134 ---------------------------------- tomcat9/image_jdk8.yaml | 136 ----------------------------------- tomcat9/jdk11-overrides.yaml | 30 -------- tomcat9/jdk8-overrides.yaml | 30 -------- 5 files changed, 7 insertions(+), 330 deletions(-) delete mode 100644 tomcat9/image_jdk11.yaml delete mode 100644 tomcat9/image_jdk8.yaml diff --git a/tomcat9/image.yaml b/tomcat9/image.yaml index 7595fb5..20cac59 100644 --- a/tomcat9/image.yaml +++ b/tomcat9/image.yaml @@ -96,6 +96,10 @@ modules: git: url: https://github.com/jboss-container-images/jboss-eap-modules.git ref: master + - name: jboss-jws-modules + git: + url: https://github.com/web-servers/jboss-jws-container-images-modules.git + ref: master - path: custom-modules install: - name: jboss.container.maven.35.bash @@ -121,6 +125,9 @@ modules: - name: jboss.container.util.logging.bash - name: os-eap-python version: "3.6" + - name: os-jws-prometheus + - name: jws5-logging + version: "1.0" packages: install: diff --git a/tomcat9/image_jdk11.yaml b/tomcat9/image_jdk11.yaml deleted file mode 100644 index 82d5535..0000000 --- a/tomcat9/image_jdk11.yaml +++ /dev/null @@ -1,134 +0,0 @@ -schema_version: 1 - -name: "jboss-webserver-5/webserver52-openjdk11-tomcat9-openshift" -description: "Red Hat JBoss Web Server 5.2 - Tomcat 9 OpenShift container image" -version: "1.0" -from: "jboss-webserver-5/webserver52-openjdk11-tomcat9:5.2.0" -labels: - - name: "com.redhat.component" - value: "jboss-webserver-5-webserver52-openjdk11-tomcat9-openshift-container" - - name: "io.k8s.description" - value: "Platform for building and running web applications on JBoss Web Server 5.2 - Tomcat v9" - - name: "io.k8s.display-name" - value: "JBoss Web Server 5.2" - - name: "io.openshift.expose-services" - value: "8080:http" - - name: "io.openshift.tags" - value: "builder,java,tomcat9" - - name: "io.openshift.s2i.scripts-url" - value: "image:///usr/local/s2i" - - name: "maintainer" - value: "szappis@redhat.com" -envs: - - name: "STI_BUILDER" - value: "jee" - - name: JWS_ADMIN_USERNAME - example: jwsadmin - - name: JWS_ADMIN_PASSWORD - example: p5sw0rdd - - name: JWS_HTTPS_CERTIFICATE_DIR - example: /opt/jws-5.2/tomcat/conf - - name: JWS_HTTPS_CERTIFICATE - example: server.crt - - name: JWS_HTTPS_CERTIFICATE_KEY - example: server.key - - name: JWS_HTTPS_CERTIFICATE_PASSWORD - example: $tr0nGPaSs? - - name: CATALINA_OPTS_APPEND - example: -Dfoo=bar - - name: JWS_REALM_USERTABLE - - name: JWS_REALM_USERNAME_COL - - name: JWS_REALM_USERCRED_COL - - name: JWS_REALM_USERROLE_TABLE - - name: JWS_REALM_ROLENAME_COL - - name: JWS_SERVER_NAME - description: Sets the server attribute of the Tomcat Connector in server.xml - example: tomcat_prod - - name: DB_SERVICE_PREFIX_MAPPING - example: test-postgresql=TEST_POSTGRESQL,test-mysql=TEST_MYSQL - - name: SCRIPT_DEBUG - description: If set to true, ensurses that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. - example: "true" - - name: "CONTAINER_HEAP_PERCENT" - example: 0.5 - description: Set the maximum Java heap size, as a percentage of available container memory. - - name: "INITIAL_HEAP_PERCENT" - example: 0.5 - description: Set the initial Java heap size, as a percentage of the maximum heap size. - - name: JAVA_MAX_MEM_RATIO - description: This is used to calculate a default maximal heap memory based on a containers restriction. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the container available memory as set here. The default is `50` which means 50% of the available memory is used as an upper boundary. You can skip this mechanism by setting this value to `0` in which case no `-Xmx` option is added. - example: "50" - - name: JAVA_INITIAL_MEM_RATIO - description: This is used to calculate a default initial heap memory based the maximumal heap memory. The default is `100` which means 100% of the maximal heap is used for the initial heap size. You can skip this mechanism by setting this value to `0` in which case no `-Xms` option is added. - example: "100" - - name: JAVA_MAX_INITIAL_MEM - description: The maximum size of the initial heap memory, if the calculated default initial heap is larger then it will be capped at this value. The default is 4096 MB. - example: "4096" - - name: JAVA_CORE_LIMIT - description: Core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. Used to configure the number of GC threads and parallelism for ForkJoinPool. Defaults to container core limit. - example: "2" - - name: JAVA_DIAGNOSTICS - description: Set this to get some diagnostics information to standard output when things are happening. **Disabled by default.** - example: "true" - - name: GC_MIN_HEAP_FREE_RATIO - description: Minimum percentage of heap free after GC to avoid expansion. - example: "20" - - name: GC_MAX_HEAP_FREE_RATIO - description: Maximum percentage of heap free after GC to avoid shrinking. - example: "40" - - name: GC_TIME_RATIO - description: Specifies the ratio of the time spent outside the garbage collection (for example, the time spent for application execution) to the time spent in the garbage collection. - example: "4" - - name: GC_ADAPTIVE_SIZE_POLICY_WEIGHT - description: The weighting given to the current GC time versus previous GC times. - example: "90" - - name: GC_MAX_METASPACE_SIZE - description: The maximum metaspace size. - example: "100" - - name: "ENABLE_ACCESS_LOG" - example: "true" - description: Enable the Access Log. -ports: - - value: 8443 -modules: - repositories: - - git: - url: https://github.com/jboss-openshift/cct_module.git - ref: 0.36.0 - - path: custom-modules - install: - - name: jboss.container.maven.35.bash - version: "3.5scl" - - name: dynamic-resources - - name: s2i-common - - name: os-jws-s2i - - name: os-jws8-conffiles - - name: os-jws-deployments - - name: add-dbs-jdk11-only - - name: os-java-jolokia - - name: os-jws-jolokia - - name: os-jws-db-drivers - - name: os-java-run - - name: os-jws-launch - - name: os-jws-https - - name: os-jws-secure-mgmt-console - - name: os-jws-rm-root - - name: os-jws-rm-defaults - - name: os-jws-chmod - - name: openshift-passwd - - name: os-logging - -packages: - install: - - PyYAML -artifacts: - - path: tomcat-8-valves-1.0.3.Final-redhat-1.jar - md5: d506949eb5044fbad5925912db1d0dff -run: - user: 185 - cmd: - - "/opt/jws-5.2/tomcat/bin/launch.sh" -osbs: - repository: - name: containers/jboss-webserver-5 - branch: jb-webserver-5.2-openjdk-11-tomcat-9-openshift-dev-rhel7 diff --git a/tomcat9/image_jdk8.yaml b/tomcat9/image_jdk8.yaml deleted file mode 100644 index 04f9620..0000000 --- a/tomcat9/image_jdk8.yaml +++ /dev/null @@ -1,136 +0,0 @@ -schema_version: 1 - -name: "jboss-webserver-5/webserver52-openjdk8-tomcat9-openshift" -description: "Red Hat JBoss Web Server 5.2 - Tomcat 9 OpenShift container image" -version: "1.0" -from: "jboss-webserver-5/webserver52-openjdk8-tomcat9:5.2.0" -labels: - - name: "com.redhat.component" - value: "jboss-webserver-5-webserver52-openjdk8-tomcat9-openshift-container" - - name: "io.k8s.description" - value: "Platform for building and running web applications on JBoss Web Server 5.2 - Tomcat v9" - - name: "io.k8s.display-name" - value: "JBoss Web Server 5.2" - - name: "io.openshift.expose-services" - value: "8080:http" - - name: "io.openshift.tags" - value: "builder,java,tomcat9" - - name: "io.openshift.s2i.scripts-url" - value: "image:///usr/local/s2i" - - name: "maintainer" - value: "szappis@redhat.com" -envs: - - name: "STI_BUILDER" - value: "jee" - - name: JWS_ADMIN_USERNAME - example: jwsadmin - - name: JWS_ADMIN_PASSWORD - example: p5sw0rdd - - name: JWS_HTTPS_CERTIFICATE_DIR - example: /opt/jws-5.2/tomcat/conf - - name: JWS_HTTPS_CERTIFICATE - example: server.crt - - name: JWS_HTTPS_CERTIFICATE_KEY - example: server.key - - name: JWS_HTTPS_CERTIFICATE_PASSWORD - example: $tr0nGPaSs? - - name: CATALINA_OPTS_APPEND - example: -Dfoo=bar - - name: JWS_REALM_USERTABLE - - name: JWS_REALM_USERNAME_COL - - name: JWS_REALM_USERCRED_COL - - name: JWS_REALM_USERROLE_TABLE - - name: JWS_REALM_ROLENAME_COL - - name: JWS_SERVER_NAME - description: Sets the server attribute of the Tomcat Connector in server.xml - example: tomcat_prod - - name: DB_SERVICE_PREFIX_MAPPING - example: test-postgresql=TEST_POSTGRESQL,test-mysql=TEST_MYSQL - - name: SCRIPT_DEBUG - description: If set to true, ensurses that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. - example: "true" - - name: "CONTAINER_HEAP_PERCENT" - example: 0.5 - description: Set the maximum Java heap size, as a percentage of available container memory. - - name: "INITIAL_HEAP_PERCENT" - example: 0.5 - description: Set the initial Java heap size, as a percentage of the maximum heap size. - - name: JAVA_MAX_MEM_RATIO - description: This is used to calculate a default maximal heap memory based on a containers restriction. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the container available memory as set here. The default is `50` which means 50% of the available memory is used as an upper boundary. You can skip this mechanism by setting this value to `0` in which case no `-Xmx` option is added. - example: "50" - - name: JAVA_INITIAL_MEM_RATIO - description: This is used to calculate a default initial heap memory based the maximumal heap memory. The default is `100` which means 100% of the maximal heap is used for the initial heap size. You can skip this mechanism by setting this value to `0` in which case no `-Xms` option is added. - example: "100" - - name: JAVA_MAX_INITIAL_MEM - description: The maximum size of the initial heap memory, if the calculated default initial heap is larger then it will be capped at this value. The default is 4096 MB. - example: "4096" - - name: JAVA_CORE_LIMIT - description: Core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. Used to configure the number of GC threads and parallelism for ForkJoinPool. Defaults to container core limit. - example: "2" - - name: JAVA_DIAGNOSTICS - description: Set this to get some diagnostics information to standard output when things are happening. **Disabled by default.** - example: "true" - - name: GC_MIN_HEAP_FREE_RATIO - description: Minimum percentage of heap free after GC to avoid expansion. - example: "20" - - name: GC_MAX_HEAP_FREE_RATIO - description: Maximum percentage of heap free after GC to avoid shrinking. - example: "40" - - name: GC_TIME_RATIO - description: Specifies the ratio of the time spent outside the garbage collection (for example, the time spent for application execution) to the time spent in the garbage collection. - example: "4" - - name: GC_ADAPTIVE_SIZE_POLICY_WEIGHT - description: The weighting given to the current GC time versus previous GC times. - example: "90" - - name: GC_MAX_METASPACE_SIZE - description: The maximum metaspace size. - example: "100" - - name: "ENABLE_ACCESS_LOG" - example: "true" - description: Enable the Access Log. -ports: - - value: 8443 -modules: - repositories: - - git: - url: https://github.com/jboss-openshift/cct_module.git - ref: 0.36.0 - - path: custom-modules - install: - - name: jboss.container.maven.35.bash - version: "3.5scl" - - name: dynamic-resources - - name: s2i-common - - name: java-alternatives - - name: os-jws-s2i - - name: os-jws8-conffiles - - name: os-jws-deployments - - name: add-dbs-jdk8 - - name: os-java-jolokia - - name: os-jws-jolokia - - name: os-jws-db-drivers - - name: os-java-run - - name: os-jws-launch - - name: os-jws-https - - name: os-jws-secure-mgmt-console - - name: os-jws-rm-root - - name: os-jws-rm-defaults - #- name: jboss-maven - - name: os-jws-chmod - - name: openshift-passwd - - name: os-logging - -packages: - install: - - PyYAML -artifacts: - - path: tomcat-8-valves-1.0.3.Final-redhat-1.jar - md5: d506949eb5044fbad5925912db1d0dff -run: - user: 185 - cmd: - - "/opt/jws-5.2/tomcat/bin/launch.sh" -osbs: - repository: - name: containers/jboss-webserver-5 - branch: private-szappis-jdk11-openshift-tomcat9-rhel7 diff --git a/tomcat9/jdk11-overrides.yaml b/tomcat9/jdk11-overrides.yaml index f434749..9094561 100644 --- a/tomcat9/jdk11-overrides.yaml +++ b/tomcat9/jdk11-overrides.yaml @@ -13,38 +13,8 @@ modules: git: url: https://github.com/jboss-openshift/cct_module.git ref: 0.39.0 - - path: custom-modules - - name: jboss-eap-modules - git: - url: https://github.com/jboss-container-images/jboss-eap-modules.git - ref: master install: - - name: jboss.container.maven.35.bash - version: "3.5" - name: jboss.container.java.rm-openjdk - - name: dynamic-resources - - name: s2i-common - - name: os-jws-s2i - - name: jws8-conffiles - version: "1.0" - - name: rm-manager - version: "1.0" - - name: os-jws-deployments - - name: jboss.container.jolokia.bash - - name: os-jws-jolokia - - name: jws5-logging - version: "1.0" - - name: jboss.container.java.jvm.bash - - name: os-jws-launch - - name: os-jws-https - - name: jws-secure-mgmt-console - version: "1.0" - - name: os-jws-rm-defaults - - name: os-jws-chmod - - name: openshift-passwd - - name: jboss.container.util.logging.bash - - name: os-eap-python - version: "3.6" osbs: repository: name: containers/jboss-webserver-openjdk11-tomcat9 diff --git a/tomcat9/jdk8-overrides.yaml b/tomcat9/jdk8-overrides.yaml index cf4c6ed..3bc9961 100644 --- a/tomcat9/jdk8-overrides.yaml +++ b/tomcat9/jdk8-overrides.yaml @@ -6,38 +6,8 @@ modules: git: url: https://github.com/jboss-openshift/cct_module.git ref: 0.39.0 - - path: custom-modules - - name: jboss-eap-modules - git: - url: https://github.com/jboss-container-images/jboss-eap-modules.git - ref: master install: - - name: jboss.container.maven.35.bash - version: "3.5" - - name: dynamic-resources - - name: s2i-common - name: java-alternatives - - name: os-jws-s2i - - name: jws8-conffiles - version: "1.0" - - name: rm-manager - version: "1.0" - - name: os-jws-deployments - - name: jboss.container.jolokia.bash - - name: os-jws-jolokia - - name: jws5-logging - version: "1.0" - - name: jboss.container.java.jvm.bash - - name: os-jws-launch - - name: os-jws-https - - name: jws-secure-mgmt-console - version: "1.0" - - name: os-jws-rm-defaults - - name: os-jws-chmod - - name: openshift-passwd - - name: jboss.container.util.logging.bash - - name: os-eap-python - version: "3.6" osbs: repository: name: containers/jboss-webserver-openjdk8-tomcat9 From 86c8885c31b3045f2e47194776b4346da58d7cde Mon Sep 17 00:00:00 2001 From: Jean-Frederic Clere Date: Tue, 13 Apr 2021 08:09:38 +0200 Subject: [PATCH 2/2] fix default branch to main. --- tomcat9/image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat9/image.yaml b/tomcat9/image.yaml index 20cac59..e100cb6 100644 --- a/tomcat9/image.yaml +++ b/tomcat9/image.yaml @@ -99,7 +99,7 @@ modules: - name: jboss-jws-modules git: url: https://github.com/web-servers/jboss-jws-container-images-modules.git - ref: master + ref: main - path: custom-modules install: - name: jboss.container.maven.35.bash