Add version 7.10.0 of Bonita #7137

educhastenier · 2019-12-16T13:48:48Z

No description provided.

educhastenier · 2019-12-19T10:54:53Z

My Bad, I'm fixing it and notify you here when it's done.

educhastenier · 2019-12-19T11:11:03Z

@yosifkit Build should work now.
Thx

yosifkit · 2019-12-19T22:42:45Z

Diff:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index d439fec..d4058bc 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,6 @@
-bonita:7.8 @ amd64
-bonita:7.8 @ arm64v8
-bonita:7.8 @ ppc64le
+bonita:7.9 @ amd64
+bonita:7.9 @ arm64v8
+bonita:7.9 @ ppc64le
 bonita:latest @ amd64
 bonita:latest @ arm64v8
 bonita:latest @ ppc64le
diff --git a/_bashbrew-list b/_bashbrew-list
index c0053c0..01f9bc7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
-bonita:7.8
-bonita:7.8.4
 bonita:7.9
 bonita:7.9.4
+bonita:7.10
+bonita:7.10.0
 bonita:latest
diff --git a/bonita_7.8/Dockerfile b/bonita_7.8/Dockerfile
deleted file mode 100644
index fefc119..0000000
diff --git a/bonita_7.8/files/WEB-INF/web.xml b/bonita_7.8/files/WEB-INF/web.xml
deleted file mode 100644
index 9b1adb7..0000000
diff --git a/bonita_7.8/files/config.sh b/bonita_7.8/files/config.sh
deleted file mode 100755
index fd70765..0000000
diff --git a/bonita_7.8/files/startup.sh b/bonita_7.8/files/startup.sh
deleted file mode 100755
index 9ef0411..0000000
diff --git a/bonita_7.8/templates/setenv.sh b/bonita_7.8/templates/setenv.sh
deleted file mode 100755
index 003c7d2..0000000
diff --git a/bonita_latest/Dockerfile b/bonita_7.9/Dockerfile
similarity index 100%
copy from bonita_latest/Dockerfile
copy to bonita_7.9/Dockerfile
diff --git a/bonita_latest/files/WEB-INF/web.xml b/bonita_7.9/files/WEB-INF/web.xml
similarity index 100%
copy from bonita_latest/files/WEB-INF/web.xml
copy to bonita_7.9/files/WEB-INF/web.xml
diff --git a/bonita_latest/files/config.sh b/bonita_7.9/files/config.sh
similarity index 100%
copy from bonita_latest/files/config.sh
copy to bonita_7.9/files/config.sh
diff --git a/bonita_7.8/files/functions.sh b/bonita_7.9/files/functions.sh
similarity index 100%
rename from bonita_7.8/files/functions.sh
rename to bonita_7.9/files/functions.sh
diff --git a/bonita_latest/files/logging.properties b/bonita_7.9/files/logging.properties
similarity index 100%
copy from bonita_latest/files/logging.properties
copy to bonita_7.9/files/logging.properties
diff --git a/bonita_latest/files/startup.sh b/bonita_7.9/files/startup.sh
similarity index 100%
copy from bonita_latest/files/startup.sh
copy to bonita_7.9/files/startup.sh
diff --git a/bonita_7.8/templates/database.properties b/bonita_7.9/templates/database.properties
similarity index 100%
rename from bonita_7.8/templates/database.properties
rename to bonita_7.9/templates/database.properties
diff --git a/bonita_latest/templates/setenv.sh b/bonita_7.9/templates/setenv.sh
similarity index 100%
copy from bonita_latest/templates/setenv.sh
copy to bonita_7.9/templates/setenv.sh
diff --git a/bonita_latest/Dockerfile b/bonita_latest/Dockerfile
index f54aa90..e1449a1 100644
--- a/bonita_latest/Dockerfile
+++ b/bonita_latest/Dockerfile
@@ -31,21 +31,25 @@ RUN (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E36
 # use --build-arg key=value in docker build command to override arguments
 ARG BONITA_VERSION
 ARG BONITA_SHA256
+ARG BASE_URL
 ARG BONITA_URL
 
-ENV BONITA_VERSION ${BONITA_VERSION:-7.9.4}
-ENV BONITA_SHA256  ${BONITA_SHA256:-0ef0adc47b3886a588802626cc941e43c8fb5c99d0ad815b3e96bdee17c321f7}
-ENV BONITA_URL ${BONITA_URL:-https://release.ow2.org/bonita/BonitaCommunity-${BONITA_VERSION}-tomcat.zip}
+ENV BONITA_VERSION ${BONITA_VERSION:-7.10.0}
+ENV BONITA_SHA256  ${BONITA_SHA256:-5ca0a60e3dfd9aa5d82485836b99f08d3f56b4a432ed742a74c51c1e76de3e12}
+
+ENV BASE_URL ${BASE_URL:-https://release.ow2.org/bonita}
+ENV BONITA_URL ${BONITA_URL:-${BASE_URL}/BonitaCommunity-${BONITA_VERSION}.zip}
+RUN echo "Downloading Bonita from url: $BONITA_URL"
 
 # add Bonita archive to the container
 RUN mkdir /opt/files \
-  && curl -fsSL ${BONITA_URL} -o /opt/files/BonitaCommunity-${BONITA_VERSION}-tomcat.zip
+  && curl -fsSL ${BONITA_URL} -o /opt/files/BonitaCommunity-${BONITA_VERSION}.zip
 
 # display downloaded checksum
-RUN sha256sum /opt/files/BonitaCommunity-${BONITA_VERSION}-tomcat.zip
+RUN sha256sum /opt/files/BonitaCommunity-${BONITA_VERSION}.zip
 
 # check with expected checksum
-RUN echo "$BONITA_SHA256" /opt/files/BonitaCommunity-${BONITA_VERSION}-tomcat.zip | sha256sum -c -
+RUN echo "$BONITA_SHA256" /opt/files/BonitaCommunity-${BONITA_VERSION}.zip | sha256sum -c -
 
 # create Volume to store Bonita files
 VOLUME /opt/bonita
diff --git a/bonita_latest/files/WEB-INF/web.xml b/bonita_latest/files/WEB-INF/web.xml
index aebf778..7d7d66d 100644
--- a/bonita_latest/files/WEB-INF/web.xml
+++ b/bonita_latest/files/WEB-INF/web.xml
@@ -665,6 +665,11 @@
 
 
     <!-- Container Resources -->
+    <resource-ref>
+        <res-ref-name>java:comp/env/RawBonitaDS</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
     <resource-ref>
         <res-ref-name>java:comp/env/bonitaDS</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>
@@ -675,6 +680,11 @@
         <res-type>javax.sql.DataSource</res-type>
         <res-auth>Container</res-auth>
     </resource-ref>
+    <resource-ref>
+        <res-ref-name>java:comp/env/RawBusinessDataDS</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
     <resource-ref>
         <res-ref-name>java:comp/env/BusinessDataDS</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>
diff --git a/bonita_latest/files/config.sh b/bonita_latest/files/config.sh
index a62a077..828051a 100755
--- a/bonita_latest/files/config.sh
+++ b/bonita_latest/files/config.sh
@@ -63,9 +63,9 @@ PLATFORM_PASSWORD=${PLATFORM_PASSWORD:-platform}
 TENANT_LOGIN=${TENANT_LOGIN:-install}
 TENANT_PASSWORD=${TENANT_PASSWORD:-install}
 
-if [ ! -d ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat ]
+if [ ! -d ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION} ]
 then
-        unzip -q ${BONITA_FILES}/BonitaCommunity-${BONITA_VERSION}-tomcat.zip -d ${BONITA_PATH}
+        unzip -q ${BONITA_FILES}/BonitaCommunity-${BONITA_VERSION}.zip -d ${BONITA_PATH}
 fi
 
 if [ "${ENSURE_DB_CHECK_AND_CREATION}" = 'true' ]
@@ -101,23 +101,23 @@ fi
 
 # apply conf
 # copy templates
-cp ${BONITA_TPL}/setenv.sh ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/tomcat-templates/setenv.sh
-cp ${BONITA_TPL}/database.properties ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/database.properties
+cp ${BONITA_TPL}/setenv.sh ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/tomcat-templates/setenv.sh
+cp ${BONITA_TPL}/database.properties ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/database.properties
 
 # if required, uncomment dynamic checks on REST API
 if [ "$REST_API_DYN_AUTH_CHECKS" = 'true' ]
 then
-    sed -i -e 's/^#GET|/GET|/' -e 's/^#POST|/POST|/' -e 's/^#PUT|/PUT|/' -e 's/^#DELETE|/DELETE|/' ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/platform_conf/initial/tenant_template_portal/dynamic-permissions-checks-custom.properties
+    sed -i -e 's/^#GET|/GET|/' -e 's/^#POST|/POST|/' -e 's/^#PUT|/PUT|/' -e 's/^#DELETE|/DELETE|/' ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/platform_conf/initial/tenant_template_portal/dynamic-permissions-checks-custom.properties
 fi
 # if required, deactivate HTTP API by updating bonita.war with proper web.xml
 if [ "$HTTP_API" = 'false' ]
 then
     cd ${BONITA_FILES}/
-    zip ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/server/webapps/bonita.war WEB-INF/web.xml
+    zip ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/server/webapps/bonita.war WEB-INF/web.xml
 fi
 
 # replace variables
-find ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/platform_conf/initial -name "*.properties" | xargs -n10 sed -i \
+find ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/platform_conf/initial -name "*.properties" | xargs -n10 sed -i \
     -e 's/^#userName\s*=.*/'"userName=${TENANT_LOGIN}"'/' \
     -e 's/^#userPassword\s*=.*/'"userPassword=${TENANT_PASSWORD}"'/' \
     -e 's/^platform.tenant.default.username\s*=.*/'"platform.tenant.default.username=${TENANT_LOGIN}"'/' \
@@ -125,15 +125,15 @@ find ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/platform_conf
     -e 's/^#platformAdminUsername\s*=.*/'"platformAdminUsername=${PLATFORM_LOGIN}"'/' \
     -e 's/^#platformAdminPassword\s*=.*/'"platformAdminPassword=${PLATFORM_PASSWORD}"'/'
 
-sed -i -e 's/{{JAVA_OPTS}}/'"${JAVA_OPTS}"'/' ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/tomcat-templates/setenv.sh
+sed -i -e 's/{{JAVA_OPTS}}/'"${JAVA_OPTS}"'/' ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/tomcat-templates/setenv.sh
 
 if [ -n "$JDBC_DRIVER" ]
 then
     # if $JDBC_DRIVER is set and the driver is not present, copy the JDBC driver into the Bundle
     file=$(basename $JDBC_DRIVER)
-    if [ ! -e ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/lib/$file ]
+    if [ ! -e ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/lib/$file ]
     then
-        cp ${BONITA_FILES}/${JDBC_DRIVER} ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/lib/
+        cp ${BONITA_FILES}/${JDBC_DRIVER} ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/lib/
     fi
 fi
 
@@ -146,14 +146,14 @@ sed -e 's/{{DB_VENDOR}}/'"${DB_VENDOR}"'/' \
     -e 's/{{BIZ_DB_USER}}/'"${BIZ_DB_USER}"'/' \
     -e 's/{{BIZ_DB_PASS}}/'"${BIZ_DB_PASS}"'/' \
     -e 's/{{BIZ_DB_NAME}}/'"${BIZ_DB_NAME}"'/' \
-    -i ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/database.properties
+    -i ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/setup/database.properties
 
 # apply logging configuration
-cp ${BONITA_FILES}/logging.properties ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}-tomcat/server/conf/logging.properties
+cp ${BONITA_FILES}/logging.properties ${BONITA_PATH}/BonitaCommunity-${BONITA_VERSION}/server/conf/logging.properties
 
 # use the setup tool to initialize and configure Bonita Tomcat bundle
-cd /opt/bonita/BonitaCommunity-${BONITA_VERSION}-tomcat
+cd /opt/bonita/BonitaCommunity-${BONITA_VERSION}
 # platform setup tool logging configuration file
-BONITA_SETUP_LOGGING_FILE=${BONITA_SETUP_LOGGING_FILE:-/opt/bonita/BonitaCommunity-${BONITA_VERSION}-tomcat/setup/logback.xml}
+BONITA_SETUP_LOGGING_FILE=${BONITA_SETUP_LOGGING_FILE:-/opt/bonita/BonitaCommunity-${BONITA_VERSION}/setup/logback.xml}
 echo y | ./setup/setup.sh init -Dlogging.config=${BONITA_SETUP_LOGGING_FILE}
 ./setup/setup.sh configure -Dlogging.config=${BONITA_SETUP_LOGGING_FILE}
diff --git a/bonita_latest/files/logging.properties b/bonita_latest/files/logging.properties
index 7d4d43f..85aeeb9 100644
--- a/bonita_latest/files/logging.properties
+++ b/bonita_latest/files/logging.properties
@@ -42,6 +42,8 @@ org.bonitasoft.engine.EngineInitializer.level = INFO
 #org.bonitasoft.engine.job.level = FINE
 #org.bonitasoft.engine.jobs.level = FINE
 #org.bonitasoft.engine.scheduler.level = FINE
+# Display monitoring information when property 'org.bonitasoft.engine.monitoring.logging.enable' is set to true in configuration file 'bonita-platform-community-custom.properties'
+org.bonitasoft.engine.configuration.LoggingMeterRegistry.level = INFO
 # Specific logger for auditing work execution
 BONITA_WORK_AUDIT.EXECUTION.level = INFO
 
@@ -49,9 +51,6 @@ BONITA_WORK_AUDIT.EXECUTION.level = INFO
 #org.bonitasoft.engine.operation.TransientDataLeftOperandHandler.level = SEVERE
 #org.bonitasoft.engine.expression.ReevaluatingTransientDataExpressionExecutorStrategy.level = SEVERE
 
-# Show stack traces of exceptions when a work fails
-org.bonitasoft.engine.execution.work.FailureHandlingBonitaWork.level = FINE
-
 # Hibernate is used by Bonita and very verbose in the log. Should stay with WARNING level except when debugging database access issues
 org.hibernate.level = WARNING
 # Remove wrong warnings about ehcache:
diff --git a/bonita_latest/files/startup.sh b/bonita_latest/files/startup.sh
index 6c41660..06b762b 100755
--- a/bonita_latest/files/startup.sh
+++ b/bonita_latest/files/startup.sh
@@ -18,5 +18,5 @@ then
 	done
 fi
 # launch tomcat
-export LOGGING_CONFIG="-Djava.util.logging.config.file=${BONITA_SERVER_LOGGING_FILE:-/opt/bonita/BonitaCommunity-${BONITA_VERSION}-tomcat/server/conf/logging.properties}"
-exec gosu bonita /opt/bonita/BonitaCommunity-${BONITA_VERSION}-tomcat/server/bin/catalina.sh run
+export LOGGING_CONFIG="-Djava.util.logging.config.file=${BONITA_SERVER_LOGGING_FILE:-/opt/bonita/BonitaCommunity-${BONITA_VERSION}/server/conf/logging.properties}"
+exec gosu bonita /opt/bonita/BonitaCommunity-${BONITA_VERSION}/server/bin/catalina.sh run

yosifkit · 2019-12-19T22:46:41Z

Build test of #7137; ac9afdc; amd64 (bonita):

$ bashbrew build bonita:7.9.4
Building bashbrew/cache:28c7afa6aa1dacb861eb7891dd097bc07157ce3c236b02b89694b027bbfe1421 (bonita:7.9.4)
Tagging bonita:7.9.4
Tagging bonita:7.9

$ test/run.sh bonita:7.9.4
testing bonita:7.9.4
	'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.10.0
Building bashbrew/cache:372006746d45162a25d3cbc17d8fe7ca91e817c3ccc02608c9cb7f94c157feb4 (bonita:7.10.0)
Tagging bonita:7.10.0
Tagging bonita:7.10
Tagging bonita:latest

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

Add version 7.10.0 of Bonita

2d029e7

educhastenier mentioned this pull request Dec 16, 2019

Update Bonita and Migration Tool versions docker-library/docs#1621

Merged

docker-library-bot added the library/bonita label Dec 16, 2019

This comment has been minimized.

Sign in to view

fix(build): reference new commit ID that fixes the build

ac9afdc

yosifkit merged commit 7fb5be0 into docker-library:master Dec 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add version 7.10.0 of Bonita #7137

Add version 7.10.0 of Bonita #7137

educhastenier commented Dec 16, 2019

This comment has been minimized.

This comment has been minimized.

educhastenier commented Dec 19, 2019

educhastenier commented Dec 19, 2019

yosifkit commented Dec 19, 2019

yosifkit commented Dec 19, 2019

Add version 7.10.0 of Bonita #7137

Add version 7.10.0 of Bonita #7137

Conversation

educhastenier commented Dec 16, 2019

This comment has been minimized.

This comment has been minimized.

educhastenier commented Dec 19, 2019

educhastenier commented Dec 19, 2019

yosifkit commented Dec 19, 2019

yosifkit commented Dec 19, 2019