pushing from internal-repo to public-repo

TIBCOSoftware · Jan 16, 2024 · 38efe55 · 38efe55
1 parent d382d43
commit 38efe55
Show file tree

Hide file tree

Showing 35 changed files with 253 additions and 175 deletions.
diff --git a/jaspersoft-containers/Docker/jrs/.env b/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.2.0
-JASPERREPORTS_SERVER_APP_IMAGE_TAG=8.2.0
-JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=8.2.0
+JASPERREPORTS_SERVER_VERSION=9.0.0
+JASPERREPORTS_SERVER_APP_IMAGE_TAG=9.0.0
+JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG=9.0.0
 TOMCAT_BASE_IMAGE= tomcat:9.0.65-jdk11-openjdk
 JDK_BASE_IMAGE=openjdk:11-jdk
 ## TOMCAT_BASE_IMAGE=tomcat:9.0.62-jdk17-openjdk

diff --git a/jaspersoft-containers/Docker/jrs/Dockerfile b/jaspersoft-containers/Docker/jrs/Dockerfile
@@ -8,7 +8,7 @@
 ARG TOMCAT_BASE_IMAGE=tomcat:9.0.65-jdk11-openjdk
 
 ARG INSTALL_CHROMIUM=false
-ARG JASPERREPORTS_SERVER_VERSION=8.2.0
+ARG JASPERREPORTS_SERVER_VERSION=9.0.0
 
 FROM ${TOMCAT_BASE_IMAGE} as deployment
 
@@ -19,7 +19,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.2.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0}
 ENV JRS_HOME /usr/src/jasperreports-server
 ENV BUILDOMATIC_MODE non-interactive
 

diff --git a/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic b/jaspersoft-containers/Docker/jrs/Dockerfile.buildomatic
@@ -8,11 +8,11 @@
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
 FROM ${JDK_BASE_IMAGE}
 
-ARG JASPERREPORTS_SERVER_VERSION=8.2.0
+ARG JASPERREPORTS_SERVER_VERSION=9.0.0
 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.2.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0}
 ENV JRS_HOME /usr/src/jasperreports-server
 ENV BUILDOMATIC_MODE non-interactive
 ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}

diff --git a/jaspersoft-containers/Docker/jrs/README.md b/jaspersoft-containers/Docker/jrs/README.md
@@ -31,7 +31,7 @@ This distribution includes Dockerfile and supporting files for building, configu
 
 # Prerequisites
 
-1. Docker-engine (19.x+) setup with Docker Compose  (3.9+)
+1. Docker-engine (20.x+) setup with Docker Compose  (3.9+)
 1. Knowledge of Docker 
 1. Git 
 1. JasperReports&reg; Server
@@ -71,9 +71,9 @@ These variables are passed to the command line with `--build-arg` for docker bui
 |INSTALL_CHROMIUM| Whether Chromium installed. **Note: Cloud Software Group, Inc. is not liable for license violation of chromium.**| false|
 |JASPERREPORTS_SERVER_APP_IMAGE_NAME| Name of the JasperReports® Server image | jasperserver-webapp|
 |JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_NAME| Name of the JasperReports® Server buildomatic image | jasperserver-buildomatic|
-|JASPERREPORTS_SERVER_VERSION|Version number of JasperReports® Server|8.2.0|
-|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the JasperReports® Server web app |8.2.0|
-|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the JasperReports® Server buildomatic |8.2.0|
+|JASPERREPORTS_SERVER_VERSION|Version number of JasperReports® Server|9.0.0|
+|JASPERREPORTS_SERVER_APP_IMAGE_TAG|Image tag of the JasperReports® Server web app |9.0.0|
+|JASPERREPORTS_SERVER_BUILDOMATIC_IMAGE_TAG|Image tag of the JasperReports® Server buildomatic |9.0.0|
 |TOMCAT_BASE_IMAGE|Tomcat Docker image certified for the version of JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types "tomcat:9.0.65-jdk11-openjdk" ,"tomcat:9.0.62-jdk17-openjdk" for Debian and "tomcat:9.0.73-jdk11-corretto","tomcat:9.0.73-jdk-17-corretto" for Amazon Linux 2 |tomcat:9.0.65-jdk11-openjdk|
 |JDK_BASE_IMAGE|Java Docker image certified for the version of JasperReports® Server being deployed based on Debian and Amazon Linux 2. It is of two types "openjdk:11-jdk","eclipse-temurin:17-jdk" and  "amazoncorretto:11","amazoncorretto:17"|openjdk:11-jdk|
 RELEASE_DATE|Release date of JasperReports® Server | May 13, 2022 |

diff --git a/jaspersoft-containers/Docker/jrs/resources/default-properties/default_master.properties b/jaspersoft-containers/Docker/jrs/resources/default-properties/default_master.properties
@@ -16,6 +16,13 @@ js.dbName=jasperserver
 dbUsername=postgres
 dbPassword=postgres
 
+#Disable Edit/Delete access to jasperserver and jasperserverAudit JNDI connections
+#jndi.restrictedAccess=true
+#analytics.dbUsername=jasperuser
+#analytics.dbPassword=password
+#auditAnalytics.dbUsername=jasperuser
+#auditAnalytics.dbPassword=password
+
 #############SCALABLE QUERY ENGINE PROPERTIES###########
 scalableQueryEngine.enabled=true
 scalableQueryEngine.url=http://localhost:8081

diff --git a/jaspersoft-containers/Docker/jrs/scripts/unpackWARInstaller.sh b/jaspersoft-containers/Docker/jrs/scripts/unpackWARInstaller.sh
@@ -5,5 +5,5 @@
 # in the license file that is distributed with this file.
 
 cd ../../../../
-unzip -o -q TIB_js-jrs_*.zip -d .
+unzip -o -q js-jrs_*.zip -d .
 
diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/.env b/jaspersoft-containers/Docker/scalableQueryEngine/.env
@@ -1,8 +1,8 @@
-JASPERREPORTS_SERVER_VERSION=8.2.0
+JASPERREPORTS_SERVER_VERSION=9.0.0
 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.2.0
-SCALABLE_QUERY_ENGINE_IMAGE_TAG=8.2.0
+SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG=9.0.0
+SCALABLE_QUERY_ENGINE_IMAGE_TAG=9.0.0
 JDK_BASE_IMAGE=openjdk:11-jdk
 ## JDK_BASE_IMAGE=eclipse-temurin:17-jdk
 ks=/etc/secrets/keystore

diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile
@@ -6,13 +6,13 @@
 #ARG JDK_BASE_IMAGE=amazoncorretto:17
 #ARG JDK_BASE_IMAGE=eclipse-temurin:17-jdk
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
-ARG JASPERREPORTS_SERVER_VERSION=8.2.0
+ARG JASPERREPORTS_SERVER_VERSION=9.0.0
 
 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.2.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0}
 ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 
 ENV WORKER_HOME /usr/local/scalable-query-engine

diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers b/jaspersoft-containers/Docker/scalableQueryEngine/Dockerfile.drivers
@@ -5,12 +5,12 @@
 #ARG JDK_BASE_IMAGE=amazoncorretto:17
 #ARG JDK_BASE_IMAGE=eclipse-temurin:17-jdk
 ARG JDK_BASE_IMAGE=openjdk:11-jdk
-ARG JASPERREPORTS_SERVER_VERSION=8.2.0
+ARG JASPERREPORTS_SERVER_VERSION=9.0.0
 
 FROM ${JDK_BASE_IMAGE} as driver
 
 ARG JASPERREPORTS_SERVER_VERSION
-ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-8.2.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0}
 ARG JRS_DISTRO=jasperreports-server-pro-${JASPERREPORTS_SERVER_VERSION}-bin
 ARG CONTAINER_DISTRO=jaspersoft-containers/Docker/scalableQueryEngine
 ENV JRS_HOME /usr/local/jasperreports-server
@@ -28,7 +28,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.2.0}
+ENV JASPERREPORTS_SERVER_VERSION ${JASPERREPORTS_SERVER_VERSION:-9.0.0}
 ENV RELEASE_DATE ${RELEASE_DATE:- 13-05-2022}
 
 LABEL "org.jasperosft.name"="Jasper Reports Server Scalable Query Engine" \

diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/README.md b/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.2.0|
+|JASPERREPORTS_SERVER_VERSION | JasperReports Server release version | 9.0.0|
 |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.2.0|
-|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 8.2.0|
+|SCALABLE_QUERY_ENGINE_DRIVER_IMAGE_TAG| Docker tag for Scalable Query Engine | 9.0.0|
+|SCALABLE_QUERY_ENGINE_IMAGE_TAG| Docker tag for Scalable Query Engine Driver | 9.0.0|
 |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","eclipse-temurin:17-jdk"and "amazoncorretto:11", "amazoncorretto:17" |openjdk:11-jdk|
 |ks | .jrsks keystore path |/etc/secrets/keystore|
 |ksp | .jrsksp keystore path | /etc/secrets/keystore |

diff --git a/jaspersoft-containers/Docker/scalableQueryEngine/scripts/installPackagesForScalableAdhoc.sh b/jaspersoft-containers/Docker/scalableQueryEngine/scripts/installPackagesForScalableAdhoc.sh
@@ -21,10 +21,9 @@ case "$PACKAGE_MGR" in
 		rm -rf /var/cache/yum
 		;;
 	"apt_get" )
-		apt-get -y update &&
-		apt-get install -y --no-install-recommends apt-utils rsync
-		apt-get install unzip
-		apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
+		DEBIAN_FRONTEND=noninteractive apt-get -y update &&
+		DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apt-utils unzip rsync
+		DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
 		rm -rf /var/lib/apt/lists/*
 		;;
 esac