Update Bonita base alpine image version to 3.20 #17136

rbioteau · 2024-07-08T07:17:31Z

Remove EOL Bonita 2022.1 version
Update all Bonita version base image to alpine 3.20
Remove a maintainer
Fix deprecated ENV assignment format

github-actions · 2024-07-08T07:18:54Z

Diff for e8cc662:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 33ad743..1715d18 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,20 +1,16 @@
-Maintainers: Danila Mazour <[email protected]> (@danila-m), Emmanuel Duchastenier <[email protected]> (@educhastenier), Pascal Garcia <[email protected]> (@passga), Anthony Birembaut <[email protected]> (@abirembaut), Romain Bioteau <[email protected]> (@rbioteau)
+Maintainers: Emmanuel Duchastenier <[email protected]> (@educhastenier), Pascal Garcia <[email protected]> (@passga), Anthony Birembaut <[email protected]> (@abirembaut), Romain Bioteau <[email protected]> (@rbioteau)
 Architectures: amd64, arm64v8, ppc64le
 GitRepo: https://github.com/bonitasoft/bonita-distrib.git
 Directory: docker
 
-Tags: 2022.1-u0, 2022.1, 7.14.0, 7.14
-GitFetch: refs/heads/docker/2022.1
-GitCommit: 4cdeb1c385b981e7074ce19cc685c08028d7149d
-
 Tags: 2022.2-u0, 2022.2, 7.15.0, 7.15
 GitFetch: refs/heads/docker/2022.2
-GitCommit: 607a6a3885df35979e0946611af4f7c858f9c989
+GitCommit: 0fbc47d8fcb6629b943b4c1e00052ca14c3d1e1b
 
 Tags: 2023.1-u0, 2023.1, 8.0.0, 8.0
 GitFetch: refs/heads/docker/2023.1
-GitCommit: 814cc8cc0a6e8b02c827cb1dfeabb1bb4569a865
+GitCommit: 31dcebbf22ebcce11f8e3a9b9444802136c36c03
 
 Tags: 2023.2-u0, 2023.2, 9.0.0, 9.0, latest
 GitFetch: refs/heads/docker/2023.2
-GitCommit: a8f0abf47fa8f7b96cb010e7d80b032ae96720ca
+GitCommit: 397824cf4f302c37f3534908728a2b8321a31565
diff --git a/_bashbrew-list b/_bashbrew-list
index 3334def..825caa1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,13 +1,9 @@
-bonita:7.14
-bonita:7.14.0
 bonita:7.15
 bonita:7.15.0
 bonita:8.0
 bonita:8.0.0
 bonita:9.0
 bonita:9.0.0
-bonita:2022.1
-bonita:2022.1-u0
 bonita:2022.2
 bonita:2022.2-u0
 bonita:2023.1
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 63dfed6..9033db1 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,3 @@
-bonita:7.14
 bonita:7.15
 bonita:8.0
 bonita:latest
diff --git a/bonita_7.14/Dockerfile b/bonita_7.14/Dockerfile
deleted file mode 100644
index 4f0d308..0000000
diff --git a/bonita_7.14/files/config.sh b/bonita_7.14/files/config.sh
deleted file mode 100755
index 82e36dc..0000000
diff --git a/bonita_7.14/files/log4j2/log4j2-appenders.xml b/bonita_7.14/files/log4j2/log4j2-appenders.xml
deleted file mode 100644
index f123712..0000000
diff --git a/bonita_7.14/files/startup.sh b/bonita_7.14/files/startup.sh
deleted file mode 100755
index 31d3499..0000000
diff --git a/bonita_7.14/templates/database.properties b/bonita_7.14/templates/database.properties
deleted file mode 100644
index 518f69a..0000000
diff --git a/bonita_7.14/templates/jmxremote.access b/bonita_7.14/templates/jmxremote.access
deleted file mode 100644
index 8bee179..0000000
diff --git a/bonita_7.14/templates/jmxremote.password b/bonita_7.14/templates/jmxremote.password
deleted file mode 100644
index 14834d8..0000000
diff --git a/bonita_7.14/templates/server.xml b/bonita_7.14/templates/server.xml
deleted file mode 100644
index 3a73e05..0000000
diff --git a/bonita_7.14/templates/setenv.sh b/bonita_7.14/templates/setenv.sh
deleted file mode 100755
index bd4a249..0000000
diff --git a/bonita_7.14/templates/tomcat-users.xml b/bonita_7.14/templates/tomcat-users.xml
deleted file mode 100644
index 8f2ec43..0000000
diff --git a/bonita_7.15/Dockerfile b/bonita_7.15/Dockerfile
index d601cf0..0f82f50 100644
--- a/bonita_7.15/Dockerfile
+++ b/bonita_7.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.20
 
 LABEL maintainer="Bonitasoft Runtime team <[email protected]>"
 
@@ -24,12 +24,12 @@ ARG BONITA_SHA256
 ARG BASE_URL
 ARG BONITA_URL
 
-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}
+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}
 
 ## Must copy files first because the bundle is either taken from url or from local /opt/files if present
 RUN mkdir /opt/files
@@ -61,25 +61,25 @@ RUN if [ -f "/opt/files/BonitaCommunity-${BRANDING_VERSION}.zip" ]; then echo "F
   && chmod -R go+w /opt/bonita/setup
 
 # ENV only required at runtime
-ENV HTTP_API false
-ENV HTTP_API_USERNAME http-api
-ENV HTTP_API_PASSWORD ""
-ENV MONITORING_USERNAME monitoring
-ENV MONITORING_PASSWORD mon1tor1ng_adm1n
-ENV JMX_REMOTE_ACCESS false
-ENV REMOTE_IP_VALVE_ENABLED false
+ENV HTTP_API=false
+ENV HTTP_API_USERNAME=http-api
+ENV HTTP_API_PASSWORD=""
+ENV MONITORING_USERNAME=monitoring
+ENV MONITORING_PASSWORD=mon1tor1ng_adm1n
+ENV JMX_REMOTE_ACCESS=false
+ENV REMOTE_IP_VALVE_ENABLED=false
 # Allow to redirect access logs to stdout:
-ENV ACCESSLOGS_STDOUT_ENABLED false
+ENV ACCESSLOGS_STDOUT_ENABLED=false
 # Allow to redirect access logs to file:
-ENV ACCESSLOGS_FILES_ENABLED false
+ENV ACCESSLOGS_FILES_ENABLED=false
 # If access log files enabled, where to put the access log files:
-ENV ACCESSLOGS_PATH /opt/bonita/logs
+ENV ACCESSLOGS_PATH=/opt/bonita/logs
 # access log files enabled, should we append new HOSTNAME directory to full path:
-ENV ACCESSLOGS_PATH_APPEND_HOSTNAME false
+ENV ACCESSLOGS_PATH_APPEND_HOSTNAME=false
 # max days access log files are conserved:
-ENV ACCESSLOGS_MAX_DAYS 30
+ENV ACCESSLOGS_MAX_DAYS=30
 # max Http threads Tomcat will use to serve HTTP/1.1 requests:
-ENV HTTP_MAX_THREADS 20
+ENV HTTP_MAX_THREADS=20
 
 
 COPY templates /opt/templates
diff --git a/bonita_8.0/Dockerfile b/bonita_8.0/Dockerfile
index f1e02f4..c77d400 100644
--- a/bonita_8.0/Dockerfile
+++ b/bonita_8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.20
 
 LABEL maintainer="Bonitasoft Runtime team <[email protected]>"
 
@@ -24,12 +24,12 @@ ARG BONITA_SHA256
 ARG BASE_URL
 ARG BONITA_URL
 
-ENV BONITA_VERSION ${BONITA_VERSION:-8.0.0}
-ENV BRANDING_VERSION ${BRANDING_VERSION:-2023.1-u0}
-ENV BONITA_SHA256  ${BONITA_SHA256:-2141b33d5835a0205e6da06580f75f44fd79c798552d4d1c3b304e6fa1b69a60}
-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}
+ENV BONITA_VERSION=${BONITA_VERSION:-8.0.0}
+ENV BRANDING_VERSION=${BRANDING_VERSION:-2023.1-u0}
+ENV BONITA_SHA256=${BONITA_SHA256:-2141b33d5835a0205e6da06580f75f44fd79c798552d4d1c3b304e6fa1b69a60}
+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}
 
 ## Must copy files first because the bundle is either taken from url or from local /opt/files if present
 RUN mkdir /opt/files
@@ -61,28 +61,28 @@ RUN if [ -f "/opt/files/BonitaCommunity-${BRANDING_VERSION}.zip" ]; then echo "F
   && chmod -R go+w /opt/bonita/setup
 
 # ENV only required at runtime
-ENV HTTP_API false
-ENV HTTP_API_USERNAME http-api
-ENV HTTP_API_PASSWORD ""
-ENV MONITORING_USERNAME monitoring
-ENV MONITORING_PASSWORD mon1tor1ng_adm1n
-ENV JMX_REMOTE_ACCESS false
-ENV REMOTE_IP_VALVE_ENABLED false
+ENV HTTP_API=false
+ENV HTTP_API_USERNAME=http-api
+ENV HTTP_API_PASSWORD=""
+ENV MONITORING_USERNAME=monitoring
+ENV MONITORING_PASSWORD=mon1tor1ng_adm1n
+ENV JMX_REMOTE_ACCESS=false
+ENV REMOTE_IP_VALVE_ENABLED=false
 
 # Allow to redirect access logs to stdout:
-ENV ACCESSLOGS_STDOUT_ENABLED false
+ENV ACCESSLOGS_STDOUT_ENABLED=false
 # Allow to redirect access logs to file:
-ENV ACCESSLOGS_FILES_ENABLED false
+ENV ACCESSLOGS_FILES_ENABLED=false
 # If access log files enabled, where to put the access log files:
-ENV ACCESSLOGS_PATH /opt/bonita/logs
+ENV ACCESSLOGS_PATH=/opt/bonita/logs
 # access log files enabled, should we append new HOSTNAME directory to full path:
-ENV ACCESSLOGS_PATH_APPEND_HOSTNAME false
+ENV ACCESSLOGS_PATH_APPEND_HOSTNAME=false
 # max days access log files are conserved:
-ENV ACCESSLOGS_MAX_DAYS 30
+ENV ACCESSLOGS_MAX_DAYS=30
 # max Http threads Tomcat will use to serve HTTP/1.1 requests:
-ENV HTTP_MAX_THREADS 20
+ENV HTTP_MAX_THREADS=20
 #install provided default page, even if a custom app is detected.
-ENV INSTALL_PROVIDED_PAGES false
+ENV INSTALL_PROVIDED_PAGES=false
 
 COPY templates /opt/templates
 VOLUME ["/opt/bonita/conf/logs"]
diff --git a/bonita_latest/Dockerfile b/bonita_latest/Dockerfile
index 8d73c65..4ca6901 100644
--- a/bonita_latest/Dockerfile
+++ b/bonita_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.20
 
 LABEL maintainer="Bonitasoft Runtime team <[email protected]>"
 
@@ -23,12 +23,12 @@ ARG BONITA_SHA256
 ARG BASE_URL
 ARG BONITA_URL
 
-ENV BONITA_VERSION ${BONITA_VERSION:-9.0.0}
-ENV BRANDING_VERSION ${BRANDING_VERSION:-2023.2-u0}
-ENV BONITA_SHA256  ${BONITA_SHA256:-c37be3ca64a07810609c97f75c47acb7fea2d29bafff181b447987514b53d140}
-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}
+ENV BONITA_VERSION=${BONITA_VERSION:-9.0.0}
+ENV BRANDING_VERSION=${BRANDING_VERSION:-2023.2-u0}
+ENV BONITA_SHA256=${BONITA_SHA256:-c37be3ca64a07810609c97f75c47acb7fea2d29bafff181b447987514b53d140}
+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}
 
 ## Must copy files first because the bundle is either taken from url or from local /opt/files if present
 RUN mkdir /opt/files
@@ -58,26 +58,26 @@ RUN if [ -f "/opt/files/BonitaCommunity-${BRANDING_VERSION}.zip" ]; then echo "F
   && chmod -R go+w /opt/bonita/setup
 
 # ENV only required at runtime
-ENV HTTP_API false
-ENV HTTP_API_USERNAME http-api
-ENV HTTP_API_PASSWORD ""
-ENV MONITORING_USERNAME monitoring
-ENV MONITORING_PASSWORD mon1tor1ng_adm1n
-ENV JMX_REMOTE_ACCESS false
-ENV REMOTE_IP_VALVE_ENABLED false
+ENV HTTP_API=false
+ENV HTTP_API_USERNAME=http-api
+ENV HTTP_API_PASSWORD=""
+ENV MONITORING_USERNAME=monitoring
+ENV MONITORING_PASSWORD=mon1tor1ng_adm1n
+ENV JMX_REMOTE_ACCESS=false
+ENV REMOTE_IP_VALVE_ENABLED=false
 
 # Allow to redirect access logs to stdout:
-ENV ACCESSLOGS_STDOUT_ENABLED false
+ENV ACCESSLOGS_STDOUT_ENABLED=false
 # Allow to redirect access logs to file:
-ENV ACCESSLOGS_FILES_ENABLED false
+ENV ACCESSLOGS_FILES_ENABLED=false
 # If access log files enabled, where to put the access log files:
-ENV ACCESSLOGS_PATH /opt/bonita/logs
+ENV ACCESSLOGS_PATH=/opt/bonita/logs
 # access log files enabled, should we append new HOSTNAME directory to full path:
-ENV ACCESSLOGS_PATH_APPEND_HOSTNAME false
+ENV ACCESSLOGS_PATH_APPEND_HOSTNAME=false
 # max days access log files are conserved:
-ENV ACCESSLOGS_MAX_DAYS 30
+ENV ACCESSLOGS_MAX_DAYS=30
 # max Http threads Tomcat will use to serve HTTP/1.1 requests:
-ENV HTTP_MAX_THREADS 20
+ENV HTTP_MAX_THREADS=20
 
 COPY templates /opt/templates
 VOLUME ["/opt/bonita/conf/logs"]

Relevant Maintainers:

bonita: @danila-m @educhastenier @passga @abirembaut @rbioteau

tianon

All the unnecessary conversions of ENV foo bar to ENV foo=bar make this diff noisier than it needs to be, but they should be harmless.

Update base alpine image version to 3.20

e8cc662

rbioteau requested a review from a team as a code owner July 8, 2024 07:17

github-actions bot added the library/bonita label Jul 8, 2024

rbioteau changed the title ~~Update base alpine image version to 3.20~~ Update Bonita base alpine image version to 3.20 Jul 8, 2024

tianon approved these changes Jul 8, 2024

View reviewed changes

tianon merged commit 1584bf8 into docker-library:master Jul 8, 2024
8 checks passed

tianon mentioned this pull request Jul 9, 2024

LegacyKeyValueFormat linter is noisy with very little practical value moby/buildkit#5130

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Bonita base alpine image version to 3.20 #17136

Update Bonita base alpine image version to 3.20 #17136

rbioteau commented Jul 8, 2024

github-actions bot commented Jul 8, 2024

tianon left a comment

Update Bonita base alpine image version to 3.20 #17136

Update Bonita base alpine image version to 3.20 #17136

Conversation

rbioteau commented Jul 8, 2024

github-actions bot commented Jul 8, 2024

tianon left a comment

Choose a reason for hiding this comment