Update bonita, add 2022.2 #13299
Merged
Update bonita, add 2022.2 #13299
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for ba72ab5:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 26b85aa..8e0b8c2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,10 +3,6 @@ Architectures: amd64, arm64v8, ppc64le
GitRepo: https://github.com/bonitasoft/bonita-distrib.git
Directory: docker
-Tags: 7.11.4, 7.11
-GitFetch: refs/heads/docker/7.11.4
-GitCommit: 7058084357dcd0fccf723ab2c7e21ec2b73f1f45
-
Tags: 2021.1, 7.12.1, 7.12
GitFetch: refs/heads/docker/2021.1
GitCommit: bfdd527629063b73f053320e50e1f6bfcd135d0a
@@ -15,5 +11,8 @@ Tags: 2021.2-u0, 2021.2, 7.13.0, 7.13
GitFetch: refs/heads/docker/2021.2
GitCommit: a1d9ee5e31d38958aa553cc7f9d465f1151d902f
-Tags: 2022.1-u0, 2022.1, 7.14.0, 7.14, latest
+Tags: 2022.1-u0, 2022.1, 7.14.0, 7.14
GitCommit: 694bf79347add872f8c6a4c0a7f5c3ef12c31dc8
+
+Tags: 2022.2-u0, 2022.2, 7.15.0, 7.15, latest
+GitCommit: 21c0e51634e836feaf910e8e3d6e95de200e1814
diff --git a/_bashbrew-list b/_bashbrew-list
index 6ef06ba..b9d5060 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,14 +1,16 @@
-bonita:7.11
-bonita:7.11.4
bonita:7.12
bonita:7.12.1
bonita:7.13
bonita:7.13.0
bonita:7.14
bonita:7.14.0
+bonita:7.15
+bonita:7.15.0
bonita:2021.1
bonita:2021.2
bonita:2021.2-u0
bonita:2022.1
bonita:2022.1-u0
+bonita:2022.2
+bonita:2022.2-u0
bonita:latest
diff --git a/bonita_7.11/Dockerfile b/bonita_7.11/Dockerfile
deleted file mode 100644
index dedde7e..0000000
diff --git a/bonita_7.11/files/WEB-INF/web.xml b/bonita_7.11/files/WEB-INF/web.xml
deleted file mode 100644
index 760f657..0000000
diff --git a/bonita_7.11/files/config.sh b/bonita_7.11/files/config.sh
deleted file mode 100755
index 10c8f18..0000000
diff --git a/bonita_7.11/files/functions.sh b/bonita_7.11/files/functions.sh
deleted file mode 100644
index 0c47279..0000000
diff --git a/bonita_7.11/files/logging.awk b/bonita_7.11/files/logging.awk
deleted file mode 100644
index 235d3da..0000000
diff --git a/bonita_7.11/files/startup.sh b/bonita_7.11/files/startup.sh
deleted file mode 100755
index 06b762b..0000000
diff --git a/bonita_7.11/templates/setenv.sh b/bonita_7.11/templates/setenv.sh
deleted file mode 100755
index f1b178a..0000000
diff --git a/bonita_latest/Dockerfile b/bonita_7.14/Dockerfile
similarity index 100%
copy from bonita_latest/Dockerfile
copy to bonita_7.14/Dockerfile
diff --git a/bonita_latest/files/config.sh b/bonita_7.14/files/config.sh
similarity index 100%
copy from bonita_latest/files/config.sh
copy to bonita_7.14/files/config.sh
diff --git a/bonita_latest/files/log4j2/log4j2-appenders.xml b/bonita_7.14/files/log4j2/log4j2-appenders.xml
similarity index 100%
copy from bonita_latest/files/log4j2/log4j2-appenders.xml
copy to bonita_7.14/files/log4j2/log4j2-appenders.xml
diff --git a/bonita_latest/files/startup.sh b/bonita_7.14/files/startup.sh
similarity index 100%
copy from bonita_latest/files/startup.sh
copy to bonita_7.14/files/startup.sh
diff --git a/bonita_7.11/templates/database.properties b/bonita_7.14/templates/database.properties
similarity index 100%
rename from bonita_7.11/templates/database.properties
rename to bonita_7.14/templates/database.properties
diff --git a/bonita_latest/templates/jmxremote.access b/bonita_7.14/templates/jmxremote.access
similarity index 100%
copy from bonita_latest/templates/jmxremote.access
copy to bonita_7.14/templates/jmxremote.access
diff --git a/bonita_latest/templates/jmxremote.password b/bonita_7.14/templates/jmxremote.password
similarity index 100%
copy from bonita_latest/templates/jmxremote.password
copy to bonita_7.14/templates/jmxremote.password
diff --git a/bonita_latest/templates/server.xml b/bonita_7.14/templates/server.xml
similarity index 100%
copy from bonita_latest/templates/server.xml
copy to bonita_7.14/templates/server.xml
diff --git a/bonita_latest/templates/setenv.sh b/bonita_7.14/templates/setenv.sh
similarity index 100%
copy from bonita_latest/templates/setenv.sh
copy to bonita_7.14/templates/setenv.sh
diff --git a/bonita_latest/templates/tomcat-users.xml b/bonita_7.14/templates/tomcat-users.xml
similarity index 100%
copy from bonita_latest/templates/tomcat-users.xml
copy to bonita_7.14/templates/tomcat-users.xml
diff --git a/bonita_latest/Dockerfile b/bonita_latest/Dockerfile
index b2ec9d1..d601cf0 100644
--- a/bonita_latest/Dockerfile
+++ b/bonita_latest/Dockerfile
@@ -1,11 +1,11 @@
-FROM alpine:3.15
+FROM alpine:3.16
LABEL maintainer="Bonitasoft Runtime team <rd.engine@bonitasoft.com>"
# Execute instructions less likely to change first
# Install packages
-RUN apk add --no-cache curl unzip bash su-exec jattach openjdk11-jre-headless
+RUN apk add --no-cache curl unzip bash su-exec jattach openjdk11-jre
RUN mkdir /opt/custom-init.d/
@@ -24,9 +24,9 @@ ARG BONITA_SHA256
ARG BASE_URL
ARG BONITA_URL
-ENV BONITA_VERSION ${BONITA_VERSION:-7.14.0}
-ENV BRANDING_VERSION ${BRANDING_VERSION:-2022.1-u0}
-ENV BONITA_SHA256 ${BONITA_SHA256:-a88b3f4368bd68dda4eccf4680a71b7e523678811b6b3bcd61cd85e67e9b9aeb}
+ENV BONITA_VERSION ${BONITA_VERSION:-7.15.0}
+ENV BRANDING_VERSION ${BRANDING_VERSION:-2022.2-u0}
+ENV BONITA_SHA256 ${BONITA_SHA256:-9e6d35b3763ccc091b4b4dec1697c96231552847d4329420e796727c946e37a6}
ENV ZIP_FILE BonitaCommunity-${BRANDING_VERSION}.zip
ENV BASE_URL ${BASE_URL:-https://github.com/bonitasoft/bonita-platform-releases/releases/download}
ENV BONITA_URL ${BONITA_URL:-${BASE_URL}/${BRANDING_VERSION}/BonitaCommunity-${BRANDING_VERSION}.zip}
diff --git a/bonita_latest/files/log4j2/log4j2-appenders.xml b/bonita_latest/files/log4j2/log4j2-appenders.xml
index f123712..a5e08a4 100644
--- a/bonita_latest/files/log4j2/log4j2-appenders.xml
+++ b/bonita_latest/files/log4j2/log4j2-appenders.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="info" monitorInterval="60">
<Properties>
- <Property name="LOG_PATTERN">%d{ISO8601_OFFSET_DATE_TIME_HHMM} | ${hostName} | %-5p | [%t|%T] %c{1.} - %m%n</Property>
+ <Property name="LOG_PATTERN">%d{ISO8601_OFFSET_DATE_TIME_HHMM} | ${hostName} | %-5p%notEmpty{[%marker]} | [%t|%T] %c{1.} - %m%n</Property>
<Property name="baseDir">/opt/bonita/logs/</Property>
</Properties>
<Appenders>Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.