Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Bonita 7.8 and remove 7.6 #5157

Merged
merged 1 commit into from
Dec 7, 2018

Conversation

JeremJR
Copy link
Contributor

@JeremJR JeremJR commented Dec 7, 2018

No description provided.

@tianon
Copy link
Member

tianon commented Dec 7, 2018

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index e21cc7b..d3e7cec 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,6 @@
-bonita:7.6 @ amd64
-bonita:7.6 @ arm64v8
-bonita:7.6 @ ppc64le
+bonita:7.7 @ amd64
+bonita:7.7 @ arm64v8
+bonita:7.7 @ ppc64le
 bonita:latest @ amd64
 bonita:latest @ arm64v8
 bonita:latest @ ppc64le
diff --git a/_bashbrew-list b/_bashbrew-list
index 05da828..129606b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
-bonita:7.6
-bonita:7.6.3
 bonita:7.7
 bonita:7.7.5
+bonita:7.8
+bonita:7.8.0
 bonita:latest
diff --git a/bonita_7.6/Dockerfile b/bonita_7.6/Dockerfile
deleted file mode 100644
index 34ce7ad..0000000
diff --git a/bonita_7.6/files/WEB-INF/web.xml b/bonita_7.6/files/WEB-INF/web.xml
deleted file mode 100644
index e0724c5..0000000
diff --git a/bonita_latest/Dockerfile b/bonita_7.7/Dockerfile
similarity index 100%
copy from bonita_latest/Dockerfile
copy to bonita_7.7/Dockerfile
diff --git a/bonita_latest/files/WEB-INF/web.xml b/bonita_7.7/files/WEB-INF/web.xml
similarity index 100%
copy from bonita_latest/files/WEB-INF/web.xml
copy to bonita_7.7/files/WEB-INF/web.xml
diff --git a/bonita_7.6/files/config.sh b/bonita_7.7/files/config.sh
similarity index 100%
rename from bonita_7.6/files/config.sh
rename to bonita_7.7/files/config.sh
diff --git a/bonita_7.6/files/functions.sh b/bonita_7.7/files/functions.sh
similarity index 100%
rename from bonita_7.6/files/functions.sh
rename to bonita_7.7/files/functions.sh
diff --git a/bonita_7.6/files/startup.sh b/bonita_7.7/files/startup.sh
similarity index 100%
rename from bonita_7.6/files/startup.sh
rename to bonita_7.7/files/startup.sh
diff --git a/bonita_7.6/templates/database.properties b/bonita_7.7/templates/database.properties
similarity index 100%
rename from bonita_7.6/templates/database.properties
rename to bonita_7.7/templates/database.properties
diff --git a/bonita_7.6/templates/setenv.sh b/bonita_7.7/templates/setenv.sh
similarity index 100%
rename from bonita_7.6/templates/setenv.sh
rename to bonita_7.7/templates/setenv.sh
diff --git a/bonita_latest/Dockerfile b/bonita_latest/Dockerfile
index c1ac26f..46fe9ed 100644
--- a/bonita_latest/Dockerfile
+++ b/bonita_latest/Dockerfile
@@ -32,9 +32,9 @@ ARG TOMCAT_VERSION
 ARG BONITA_SHA256
 ARG BONITA_URL
 
-ENV BONITA_VERSION ${BONITA_VERSION:-7.7.5}
-ENV TOMCAT_VERSION ${TOMCAT_VERSION:-8.5.31}
-ENV BONITA_SHA256  ${BONITA_SHA256:-cbed7de66b763683e1edad0aa374f234e6b7c4bebaf5dd31925125196fceab81}
+ENV BONITA_VERSION ${BONITA_VERSION:-7.8.0}
+ENV TOMCAT_VERSION ${TOMCAT_VERSION:-8.5.34}
+ENV BONITA_SHA256  ${BONITA_SHA256:-953d0eea3afb60b67edc023a46ae7f4018ef2531597fda134840077c7feb01fd}
 ENV BONITA_URL ${BONITA_URL:-https://release.ow2.org/bonita/BonitaCommunity-${BONITA_VERSION}-Tomcat-${TOMCAT_VERSION}.zip}
 
 # add Bonita archive to the container
diff --git a/bonita_latest/files/WEB-INF/web.xml b/bonita_latest/files/WEB-INF/web.xml
index 1ae24cb..9b1adb7 100644
--- a/bonita_latest/files/WEB-INF/web.xml
+++ b/bonita_latest/files/WEB-INF/web.xml
@@ -181,6 +181,13 @@
         <url-pattern>/portal/resource/*</url-pattern>
         <url-pattern>/apps/*</url-pattern>
     </filter-mapping>
+    <filter-mapping>
+        <filter-name>AuthenticationFilter</filter-name>
+        <url-pattern>/portal/*</url-pattern>
+        <url-pattern>/portal.js/*</url-pattern>
+        <url-pattern>/apps/*</url-pattern>
+        <url-pattern>/services/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>RestAPIAuthorizationFilter</filter-name>
         <url-pattern>/API/*</url-pattern>
@@ -216,13 +223,6 @@
         <url-pattern>/portal/BonitaConsole.html</url-pattern>
         <url-pattern>/portal/homepage</url-pattern>
     </filter-mapping>
-    <filter-mapping>
-        <filter-name>AuthenticationFilter</filter-name>
-        <url-pattern>/portal/*</url-pattern>
-        <url-pattern>/portal.js/*</url-pattern>
-        <url-pattern>/apps/*</url-pattern>
-        <url-pattern>/services/*</url-pattern>
-    </filter-mapping>
     <filter-mapping>
         <filter-name>BPMURLSupportFilter</filter-name>
         <url-pattern>/portal/BonitaConsole.html</url-pattern>
diff --git a/bonita_latest/templates/setenv.sh b/bonita_latest/templates/setenv.sh
index 8076742..003c7d2 100755
--- a/bonita_latest/templates/setenv.sh
+++ b/bonita_latest/templates/setenv.sh
@@ -17,13 +17,11 @@ BDM_DB_OPTS="-Dsysprop.bonita.bdm.db.vendor=h2"
 # Bitronix (JTA service added to Tomcat and required by Bonita Engine for transaction management)
 BTM_OPTS="-Dbtm.root=${CATALINA_HOME} -Dbitronix.tm.configuration=${CATALINA_HOME}/conf/bitronix-config.properties"
 
-JAVA_OPTS="{{JAVA_OPTS}}"
-
 # Optional JAAS configuration. Usually used when delegating authentication to LDAP / Active Directory server
 #SECURITY_OPTS="-Djava.security.auth.login.config=${CATALINA_HOME}/conf/jaas-standard.cfg"
 
 # Pass the JVM system properties to Tomcat JVM using CATALINA_OPTS variable
-CATALINA_OPTS="${CATALINA_OPTS} ${PLATFORM_SETUP} ${H2_DATABASE_DIR} ${DB_OPTS} ${BDM_DB_OPTS} ${BTM_OPTS} ${JAVA_OPTS} ${INCIDENT_LOG_DIR} -Dfile.encoding=UTF-8 -Xshare:auto -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${CATALINA_HOME}/logs -Djava.security.egd=file:/dev/./urandom"
+CATALINA_OPTS="${CATALINA_OPTS} ${PLATFORM_SETUP} ${H2_DATABASE_DIR} ${DB_OPTS} ${BDM_DB_OPTS} ${BTM_OPTS} ${INCIDENT_LOG_DIR} -Dfile.encoding=UTF-8 -Xshare:auto -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${CATALINA_HOME}/logs -Djava.security.egd=file:/dev/./urandom"
 export CATALINA_OPTS
 
 # Only set CATALINA_PID if not already set (check for empty value) by startup script (usually done by /etc/init.d/tomcat8 but not by startup.sh nor catalina.sh)

@tianon
Copy link
Member

tianon commented Dec 7, 2018

LGTM

Build test of #5157; 203099a; amd64 (bonita):

$ bashbrew build bonita:7.7.5
Using bashbrew/cache:78e261c4418cf040bb140c2f75538280fcaef6a3c543359795d49727a75565ec (bonita:7.7.5)
Tagging bonita:7.7.5
Tagging bonita:7.7

$ test/run.sh bonita:7.7.5
testing bonita:7.7.5
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build bonita:7.8.0
Building bashbrew/cache:cc81c8e395637a495209843978bf124eddd8ed672efe886cad406880f743e15c (bonita:7.8.0)
Tagging bonita:7.8.0
Tagging bonita:7.8
Tagging bonita:latest

$ test/run.sh bonita:7.8.0
testing bonita:7.8.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit ee25755 into docker-library:master Dec 7, 2018
@JeremJR
Copy link
Contributor Author

JeremJR commented Dec 7, 2018

impressive response time! 🥇
thank you
have a nice weekend

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants