Skip to content

Commit 8ab9df6

Browse files
MaximMoninMaximMonin
committed
camunda 7.22, nodejs 22, redis 7 -> valkey 8
1 parent 93a4f85 commit 8ab9df6

18 files changed

+589
-454
lines changed

‎.env-dev

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CAMUNDA=192.168.106.1
66
CLUSTER_NETWORK=192.168.106.0/24
77

88
PGADMIN_PASSWORD=supersecret
9-
REDIS_PASSWORD=somesupersecretredispassword
9+
VALKEY_PASSWORD=somesupersecretredispassword
1010
CAMUNDA_PASSWORD=Y2FtdW5kYQo=
1111

1212
CLUSTER_GATE_PORT=2910
@@ -16,10 +16,10 @@ CLUSTER_HTTPS_PORT2=2917
1616
DB_PORT=192.168.106.1:2913
1717
PGADMIN_PORT=2914
1818

19-
REDIS_PORTS=camunda:2930,camunda:2931,camunda:2932
20-
REDIS_PORT1=192.168.106.1:2930
21-
REDIS_PORT2=192.168.106.1:2931
22-
REDIS_PORT3=192.168.106.1:2932
19+
VALKEY_PORTS=camunda:2930,camunda:2931,camunda:2932
20+
VALKEY_PORT1=192.168.106.1:2930
21+
VALKEY_PORT2=192.168.106.1:2931
22+
VALKEY_PORT3=192.168.106.1:2932
2323

2424
## Common Params
2525
LogLevel=info

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/db/*
2-
/redis/*
2+
/valkey/*
33
/logs/*
44
/tmp/*
55
/cfg/ssl/*

‎cfg/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM camunda/camunda-bpm-platform:tomcat-7.21.0
1+
FROM camunda/camunda-bpm-platform:tomcat-7.22.0
22
RUN rm -r webapps/camunda-invoice webapps/examples && \
33
rm -f lib/postgresql-42.5.5.jar && \
4-
wget https://jdbc.postgresql.org/download/postgresql-42.7.3.jar -P lib/
4+
wget https://jdbc.postgresql.org/download/postgresql-42.7.4.jar -P lib/
55
COPY web.xml webapps/engine-rest/WEB-INF/web.xml
66
COPY bpm-platform.xml conf/
77

@@ -12,12 +12,12 @@ COPY scripts2/* webapps/camunda/app/tasklist/scripts/
1212

1313
# Custom process engine plugins
1414
RUN wget https://repo1.maven.org/maven2/redis/clients/jedis/3.10.0/jedis-3.10.0.jar -P lib/ && \
15-
wget https://repo1.maven.org/maven2/org/jsoup/jsoup/1.17.2/jsoup-1.17.2.jar -P lib/
15+
wget https://repo1.maven.org/maven2/org/jsoup/jsoup/1.18.1/jsoup-1.18.1.jar -P lib/
1616
COPY plugins/* lib/
1717

1818
# session management
19-
RUN wget https://repo1.maven.org/maven2/org/redisson/redisson-tomcat-9/3.28.0/redisson-tomcat-9-3.28.0.jar -P lib/ && \
20-
wget https://repo1.maven.org/maven2/org/redisson/redisson-all/3.28.0/redisson-all-3.28.0.jar -P lib/
19+
RUN wget https://repo1.maven.org/maven2/org/redisson/redisson-tomcat-10/3.39.0/redisson-tomcat-10-3.39.0.jar -P lib/ && \
20+
wget https://repo1.maven.org/maven2/org/redisson/redisson-all/3.39.0/redisson-all-3.39.0.jar -P lib/
2121
COPY redisson.conf conf/
2222
COPY context.xml webapps/camunda/META-INF/
2323
COPY context.xml webapps/camunda-welcome/META-INF/

‎cfg/bpm-platform.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<bpm-platform xmlns="http://www.camunda.org/schema/1.0/BpmPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://www.camunda.org/schema/1.0/BpmPlatform http://www.camunda.org/schema/1.0/BpmPlatform ">
34

@@ -34,10 +35,7 @@
3435
<property name="jobExecutorAcquireByPriority">false</property>
3536
<property name="jobExecutorPreferTimerJobs">false</property>
3637
<property name="jobExecutorAcquireByDueDate">false</property>
37-
<property name="commandRetries">3</property>
3838
<property name="tenantCheckEnabled">false</property>
39-
<property name="initializeTelemetry">false</property>
40-
<property name="telemetryReporterActivate">false</property>
4139
<property name="historyCleanupEnabled">true</property>
4240
<property name="historyCleanupStrategy">removalTimeBased</property>
4341
<property name="historyCleanupBatchWindowStartTime">00:01</property>

‎cfg/plugins/camunda-administrative-user-plugin-v1.0.0.jar

-35 Bytes
Binary file not shown.

‎cfg/plugins/camunda-incident-plugin-v1.0.0.jar

-10 Bytes
Binary file not shown.

‎cfg/plugins/camunda-process-end-plugin-v1.0.0.jar

-51 Bytes
Binary file not shown.

‎cfg/redisson.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ singleServerConfig:
77
password: ${RedisPass}
88
subscriptionsPerConnection: 5
99
clientName: null
10-
address: "redis://redis1:6379"
10+
address: "redis://valkey1:6379"
1111
subscriptionConnectionMinimumIdleSize: 1
1212
subscriptionConnectionPoolSize: 50
1313
connectionMinimumIdleSize: 24
@@ -16,5 +16,5 @@ singleServerConfig:
1616
dnsMonitoringInterval: 5000
1717
threads: 16
1818
nettyThreads: 32
19-
codec: !<org.redisson.codec.MarshallingCodec> {}
19+
codec: !<org.redisson.codec.Kryo5Codec> {}
2020
transportMode: "NIO"

‎cfg/server.xml

+11-17
Original file line numberDiff line numberDiff line change
@@ -82,29 +82,23 @@
8282
Either JSSE or OpenSSL style configuration may be used regardless of
8383
the SSLImplementation selected. JSSE style configuration is used below.
8484
-->
85+
<!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 -->
8586
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
86-
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
87-
keystoreFile="/camunda/conf/camunda.p12" keystorePass=""
88-
clientAuth="false" sslProtocol="TLS" sessionTimeout="0">
87+
maxThreads="150" SSLEnabled="true">
88+
<SSLHostConfig>
89+
<Certificate
90+
certificateKeystoreFile="/camunda/conf/camunda.p12"
91+
certificateKeystorePassword=""
92+
type="RSA"
93+
/>
94+
</SSLHostConfig>
8995
</Connector>
9096
<!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
9197
This connector uses the APR/native implementation which always uses
9298
OpenSSL for TLS.
9399
Either JSSE or OpenSSL style configuration may be used. OpenSSL style
94100
configuration is used below.
95101
-->
96-
<!--
97-
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
98-
maxThreads="150" SSLEnabled="true" >
99-
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
100-
<SSLHostConfig>
101-
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
102-
certificateFile="conf/localhost-rsa-cert.pem"
103-
certificateChainFile="conf/localhost-rsa-chain.pem"
104-
type="RSA" />
105-
</SSLHostConfig>
106-
</Connector>
107-
-->
108102
<!-- Define an AJP 1.3 Connector on port 8009 -->
109103
<!--
110104
<Connector protocol="AJP/1.3"
@@ -146,9 +140,9 @@
146140
Documentation at: /docs/config/valve.html
147141
Note: The pattern used is equivalent to using pattern="common" -->
148142
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b"/>
149-
<!-- To allow access only for the clients connecting from whitelist -->
143+
<!-- To allow access only for the clients connecting from whitelist -->
150144
<!--
151-
<Valve className="org.apache.catalina.valves.RemoteCIDRValve" allow="192.168.100.0/28, 192.168.106.0/24"/>
145+
<Valve className="org.apache.catalina.valves.RemoteCIDRValve" allow="192.168.100.0/28, 192.168.106.0/24"/>
152146
-->
153147
</Host>
154148
</Engine>

0 commit comments

Comments
 (0)