Merge pull request #84 from TIBCOSoftware/release-8.1.1

Release 8.1.1

jaspersoft-containers/Docker/jrs/.env

@@ -1,9 +1,9 @@
 INSTALL_CHROMIUM=false
 JASPERREPORTS_SERVER_APP_IMAGE_NAME=jasperserver-webapp
 JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME=jasperserver-buildomatic
-JASPERREPORTS_SERVER_VERSION=8.1.0
-JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.1.0
-JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.1.0
+JASPERREPORTS_SERVER_VERSION=8.1.1
+JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.1.1
+JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.1.1
 TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk
 JDK_BASE_IMAGE=openjdk:11-jdk
 RELEASE_DATE=May 13,2022

jaspersoft-containers/Docker/jrs/Dockerfile

@@ -5,7 +5,7 @@
 #ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-corretto
 ARG TOMCAT_BASE_IMAGE=tomcat:9.0.54-jdk11-openjdk
 ARG INSTALL_CHROMIUM=false
-ARG JASPERREPORTS_SERVER_VERSION=8.1.0
+ARG JASPERREPORTS_SERVER_VERSION=8.1.1
 
 FROM ${TOMCAT_BASE_IMAGE} as deployment
 
@@ -16,7 +16,7 @@ ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 
 
 ENV INSTALL_CHROMIUM ${INSTALl_CHROMIUM:-false}
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
 ENV JRS_HOME /usr/src/jasperreports-server
 ENV BUILDOMATIC_MODE non-interactive
 

jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic

@@ -6,11 +6,11 @@
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
 FROM ${JDK_BASE_IMAGE}
 
-ARG JASPERREPORTS_SERVER_VERSION=8.1.0
+ARG JASPERREPORTS_SERVER_VERSION=8.1.1
 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/jrs
 ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
 ENV JRS_HOME /usr/src/jasperreports-server
 ENV BUILDOMATIC_MODE non-interactive
 ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}

jaspersoft-containers/Docker/jrs/README.md

@@ -71,9 +71,9 @@ These variables are passed to the command line with `--build-arg` for docker bui
 |INSTALL_CHROMIUM| Whether Chromium installed. **Note: TIBCO Software Inc. is not liable for license violation of chromium.**| false|
 |JASPERREPORTS_SERVER_APP_IMAGE_NAME| Name of the TIBCO JasperReports® Server image | jasperserver-webapp|
 |JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME| Name of the TIBCO JasperReports® Server buildomatic image | jasperserver-buildomatic|
-|JASPERREPORTS_SERVER_VERSION|Version number of TIBCO JasperReports® Server|8.1.0|
-|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server web app |8.1.0|
-|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server buildomatic |8.1.0|
+|JASPERREPORTS_SERVER_VERSION|Version number of TIBCO JasperReports® Server|8.1.1|
+|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server web app |8.1.1|
+|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the TIBCO JasperReports® Server buildomatic |8.1.1|
 |TOMCAT_BASE_IMAGE|Tomcat Docker image certified for the version of TIBCO JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types "tomcat:9.0.54-jdk11-openjdk" for Debian and "tomcat:9.0.54-jdk11-corretto" for Amazon Linux 2 |tomcat:9.0.54-jdk11-openjdk|
 |JDK_BASE_IMAGE|Java Docker image certified for the version of TIBCO JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types openjdk:11-jdk and  amazoncorretto:11|openjdk:11-jdk|
 RELEASE_DATE|Release date of TIBCO JasperReports® Server | May 13, 2022 |
@@ -231,13 +231,12 @@ If you plan to work with **default** JasperReports® Server and buildomatic setu
 # Deploying the Application in Cluster Mode
 
 - It uses haproxy as a load balancer and activemq as a cache replication. Before launching the application, make sure images are created successfully and repository DB setup is also completed.
+- Update the value of parameter 'replicas' in cluster-docker-compose.yml file depending upon how many containers you would want to create.
 
    `docker-compose -f cluster-docker-compose.yml up -d`
 
 - Wait for the application to start and access the application by using `host-name/jasperserver-pro` (port is not needed, haproxy is running on port 80).
 
- **Note:** Although an external repository DB is used, a PostgreSQL container is created, and it does not impact TIBCO JasperReports® Server. If you don't want to create a PostgreSQL container, then remove repository dependency from jasperserver-webapp-1 and jasperserver-webapp-2 services in cluster-docker-compose.yaml.
-
 
 # Deploying JasperReports Server and Scalable Query Engine
 

jaspersoft-containers/Docker/jrs/cluster-config/haproxy.cfg

@@ -3,27 +3,39 @@ global
 	daemon
 	maxconn 256
 
+resolvers docker
+    nameserver dns1 127.0.0.11:53
+    resolve_retries 3
+    timeout resolve 1s
+    timeout retry   1s
+    hold other      10s
+    hold refused    10s
+    hold nx         10s
+    hold timeout    10s
+    hold valid      10s
+    hold obsolete   10s
+
 defaults
-	mode http
-	timeout connect 5000ms
+    mode http
+    timeout connect 5000ms
 	timeout client 50000ms
 	timeout server 50000ms
+    log global
+    option httplog
 
- listen stats
+listen stats
 	bind *:9999
 	stats enable
 	stats hide-version
 	stats uri /stats
 	stats auth admin:admin@123
- 
+
 frontend myApp
 	bind *:80
-	#acl acl_myApp path_sub myApp
-	#use_backend myAppBackEnd if acl_myApp
 	use_backend jasperserver-pro
 
 backend jasperserver-pro
 	balance roundrobin
-	cookie JSESSIONID prefix nocache
-	server web01 jasperserver-webapp-1:8080 check cookie web01
-	server web02 jasperserver-webapp-2:8080 check cookie web02
+	dynamic-cookie-key mysecretphrase
+	cookie JSESSIONID prefix dynamic nocache
+	server-template jasperserver-webapp- 10 jasperserver-webapp:8080 check resolvers docker init-addr libc,none

jaspersoft-containers/Docker/jrs/cluster-docker-compose.yml

@@ -5,71 +5,54 @@
 version: '3.9'
 
 services:
-##### JRS First instance
-  jasperserver-webapp-1:
+  ##### JRS First instance
+  jasperserver-webapp:
     image: "${JASPERREPORTS_SERVER_APP_IMAGE_NAME}:${JASPERREPORTS_SERVER_APP_IMAGE_TAG}"
+    networks:
+      - jrs_network
     env_file: .env
     environment:
-      JAVA_OPTS: "-Xmx3500M -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 "
+      JAVA_OPTS: "-XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 "
     volumes:
       - ./resources/keystore:/usr/local/share/jasperserver-pro/keystore
       - ./resources/license/jasperserver.license:/usr/local/share/jasperserver-pro/license/jasperserver.license
     mem_limit: 6g
     mem_reservation: 3g
     cpu_shares: 1000
-
-    depends_on:
-      - activemq
-      - repository
-
-##### JRS Second instance
-  jasperserver-webapp-2:
-    image: "${JASPERREPORTS_SERVER_APP_IMAGE_NAME}:${JASPERREPORTS_SERVER_APP_IMAGE_TAG}"
-    env_file: .env
-    environment:
-      JAVA_OPTS: "-Xmx3500M  -Djs.license.directory=/usr/local/share/jasperserver-pro/license  -Djasperserver.cache.jms.provider=tcp://activemq:61616 "
-    volumes:
-      - ./resources/keystore:/usr/local/share/jasperserver-pro/keystore
-      - ./resources/license/jasperserver.license:/usr/local/share/jasperserver-pro/license/jasperserver.license
-    mem_limit: 6g
-    mem_reservation: 3g
-    cpu_shares: 1000
-
+    deploy:
+      mode: replicated
+      replicas: 2
     depends_on:
       - activemq
-      - repository
 
-####### Loadbalancer to manage the JRS Instances and session replication
+  ####### Loadbalancer to manage the JRS Instances and session replication
   haproxy:
     image: haproxy:2.3.9-alpine
+    networks:
+      - jrs_network
     ports:
       - 80:80
       - 9999:9999
     volumes:
       - ./cluster-config:/usr/local/etc/haproxy
     depends_on:
-      - jasperserver-webapp-1
-      - jasperserver-webapp-2
+      - jasperserver-webapp
 
-##### Repository cache replication runs on 61616 port and 8161 to access from web
+  ##### Repository cache replication runs on 61616 port and 8161 to access from web
   activemq:
-    image: rangareddyv/activemq-openshift:5.16.2
+    image: bansamadev/activemq:5.17.2
+    networks:
+      - jrs_network
     ports:
       - 8161:8161
       - 61616:61616
 
-#### JRS Repository database
-  repository:
-    image: postgres:12
-    ports:
-      - 5432:5432
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-
-#### Postgresql Volume
-volumes:
-  postgres-data:
-    name: jrs-repository-vol
+networks:
+  jrs_network:
+    # use the bridge driver, but enable IPv6
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.16.238.0/24
+          gateway: 172.16.238.1

jaspersoft-containers/Docker/jrs/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - 8080:8080
       - 8443:8443
     environment:
-      JAVA_OPTS: "-Xmx3500M -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 "
+      JAVA_OPTS: "-XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 -Djs.license.directory=/usr/local/share/jasperserver-pro/license -Djasperserver.cache.jms.provider=tcp://activemq:61616 "
     volumes:
       - ./resources/keystore:/usr/local/share/jasperserver-pro/keystore
       - ./resources/license/jasperserver.license:/usr/local/share/jasperserver-pro/license/jasperserver.license
@@ -60,7 +60,7 @@ services:
       - postgres-data:/var/lib/postgresql/data
 
   activemq:
-    image: rangareddyv/activemq-openshift:5.16.2
+    image: bansamadev/activemq:5.17.2
     ports:
       - 8161:8161
       - 61616:61616

jaspersoft-containers/Docker/scalableQueryEngine/.env

@@ -1,8 +1,8 @@
-JASPERREPORTS_SERVER_VERSION=8.1.0
+JASPERREPORTS_SERVER_VERSION=8.1.1
 SCALABLE_QUERY_ENGINE_IMAGE_NAME=scalable-query-engine
 SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_NAME=scalable-query-engine-drivers
-SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG=8.1.0
-SCALABLE_QUERY_ENGINE_IMAGE_TAG=8.1.0
+SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG=8.1.1
+SCALABLE_QUERY_ENGINE_IMAGE_TAG=8.1.1
 JDK_BASE_IMAGE=openjdk:11-jdk
 ks=/etc/secrets/keystore
 ksp=/etc/secrets/keystore

jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile

@@ -4,13 +4,13 @@
 
 #ARG JDK_BASE_IMAGE=amazoncorretto:11
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
-ARG JASPERREPORTS_SERVER_VERSION=8.1.0
+ARG JASPERREPORTS_SERVER_VERSION=8.1.1
 
 FROM ${JDK_BASE_IMAGE} AS worker
 
 ARG JASPERREPORTS_SERVER_VERSION
 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
 ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 
 ENV WORKER_HOME /usr/local/scalable-query-engine
@@ -59,4 +59,4 @@ COPY --from=worker --chown=jasperserver:root /usr/local/scalable-query-engine/sp
 COPY --from=worker --chown=jasperserver:root /usr/local/scalable-query-engine/snapshot-dependencies/ .
 COPY --from=worker --chown=jasperserver:root /usr/local/scalable-query-engine/application/ .
 
-ENTRYPOINT ["java", "org.springframework.boot.loader.PropertiesLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.PropertiesLauncher"]

jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers

@@ -3,12 +3,12 @@
 # in the license file that is distributed with this file
 #ARG JDK_BASE_IMAGE=amazoncorretto:11
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
-ARG JASPERREPORTS_SERVER_VERSION=8.1.0
+ARG JASPERREPORTS_SERVER_VERSION=8.1.1
 
 FROM ${JDK_BASE_IMAGE} as driver
 
 ARG JASPERREPORTS_SERVER_VERSION
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
 ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine
 ENV JRS_HOME /usr/local/jasperreports-server
@@ -26,7 +26,7 @@ FROM ${JDK_BASE_IMAGE}
 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine
 ENV WAR_JARS=/usr/local/jasperreports-server/buildomatic/conf_source/iePro/lib
 ENV WAR_LIB_JARS=/usr/local/jasperreports-server/jasperserver-pro/WEB-INF/lib
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.1.1}
 ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}
 
 LABEL "org.jasperosft.name"="Jasper Reports Server Scalable Query Engine" \

jaspersoft-containers/Docker/scalableQueryEngine/README.md

@@ -56,11 +56,11 @@ and all the deployment configurations are managed by Helm charts and Redis is us
 
 | Environment Variable Name | Description | Default Value|
 |------------| -------------|--------------|
-|JASPERREPORTS_SERVER_VERSION | JasperReports Server release version | 8.1.0|
+|JASPERREPORTS_SERVER_VERSION | JasperReports Server release version | 8.1.1|
 |SCALABLE_QUERY_ENGINE_IMAGE_NAME| Scalable Query Engine image name |scalable-query-engine|
 |SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_NAME| Scalable Query Engine JDBC drivers image name| scalable-query-engine-driver|
-|SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG| Docker tag for Scalable Query Engine | 8.1.0|
-|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 8.1.0|
+|SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG| Docker tag for Scalable Query Engine | 8.1.1|
+|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 8.1.1|
 |JDK_BASE_IMAGE | Docker image certified for the version of JasperReports Server being deployed based on Debian and Amazon Linux 2, and it is of two types **openjdk:11-jdk** for Debian and **amazoncorretto:11** for Amazon Linux 2 |openjdk:11-jdk|
 |ks | .jrsks keystore path |/etc/secrets/keystore|
 |ksp | .jrsksp keystore path | /etc/secrets/keystore |