support additional-config file in splice images (#3486)

isegall-da · web-flow · commit bf4fe0ff7dd7 · 2026-01-08T12:49:41.000-05:00
Signed-off-by: Itai Segall &lt;itai.segall@digitalasset.com&gt;
diff --git a/cluster/images/canton-cometbft-sequencer/app.conf b/cluster/images/canton-cometbft-sequencer/app.conf
diff --git a/cluster/images/canton-domain/Dockerfile b/cluster/images/canton-domain/Dockerfile
@@ -18,3 +18,9 @@ COPY app.conf bootstrap.sc /app/
 
 HEALTHCHECK --start-period=10m \
   CMD grpcurl -plaintext localhost:5061 grpc.health.v1.Health/Check && grpcurl -plaintext localhost:5062 grpc.health.v1.Health/Check || exit 1
+
+# Not upstreamed on purpose, this is the Splice part to allow easy overrides from within Splice:
+COPY additional-config.conf /app/
+USER root
+RUN chown -R nonroot:nonroot /app/additional-config.conf
+USER nonroot
diff --git a/cluster/images/canton-domain/additional-config.conf b/cluster/images/canton-domain/additional-config.conf
@@ -0,0 +1,4 @@
+# Configurations here will be applied after app.conf, and before any ADDITIONAL_CONFIG env vars
+# Please use this file for temporary changes that require quick iterations. Once made permanent,
+# please upstream the change to the Canton repo.
+
diff --git a/cluster/images/canton-domain/app.conf b/cluster/images/canton-domain/app.conf
@@ -1,3 +1,7 @@
+# This file is frozen, and will be deleted soon (in favor of its copy upstream in Canton repo).
+# Please DO NOT modify this file. For quick iterations on config changes, use additional-config.conf.
+# For permanent ones, please upstream the change to Canton repo.
+
 include required(file("/app/storage.conf"))
 
 canton {
diff --git a/cluster/images/canton-mediator/Dockerfile b/cluster/images/canton-mediator/Dockerfile
@@ -11,3 +11,9 @@ EXPOSE 5007
 EXPOSE 10013
 
 COPY app.conf /app/
+
+# Not upstreamed on purpose, this is the Splice part to allow easy overrides from within Splice:
+COPY additional-config.conf /app/
+USER root
+RUN chown -R nonroot:nonroot /app/additional-config.conf
+USER nonroot
diff --git a/cluster/images/canton-mediator/additional-config.conf b/cluster/images/canton-mediator/additional-config.conf
@@ -0,0 +1,4 @@
+# Configurations here will be applied after app.conf, and before any ADDITIONAL_CONFIG env vars
+# Please use this file for temporary changes that require quick iterations. Once made permanent,
+# please upstream the change to the Canton repo.
+
diff --git a/cluster/images/canton-mediator/app.conf b/cluster/images/canton-mediator/app.conf
@@ -1,3 +1,7 @@
+# This file is frozen, and will be deleted soon (in favor of its copy upstream in Canton repo).
+# Please DO NOT modify this file. For quick iterations on config changes, use additional-config.conf.
+# For permanent ones, please upstream the change to Canton repo.
+
 include required(file("/app/storage.conf"))
 
 canton {
diff --git a/cluster/images/canton-participant/Dockerfile b/cluster/images/canton-participant/Dockerfile
@@ -16,3 +16,9 @@ COPY app.conf /app/
 
 HEALTHCHECK --start-period=10m \
   CMD grpcurl -plaintext localhost:5061 grpc.health.v1.Health/Check || exit 1
+
+# Not upstreamed on purpose, this is the Splice part to allow easy overrides from within Splice:
+COPY additional-config.conf /app/
+USER root
+RUN chown -R nonroot:nonroot /app/additional-config.conf
+USER nonroot
diff --git a/cluster/images/canton-participant/additional-config.conf b/cluster/images/canton-participant/additional-config.conf
@@ -0,0 +1,4 @@
+# Configurations here will be applied after app.conf, and before any ADDITIONAL_CONFIG env vars
+# Please use this file for temporary changes that require quick iterations. Once made permanent,
+# please upstream the change to the Canton repo.
+
diff --git a/cluster/images/canton-participant/app.conf b/cluster/images/canton-participant/app.conf
@@ -1,3 +1,7 @@
+# This file is frozen, and will be deleted soon (in favor of its copy upstream in Canton repo).
+# Please DO NOT modify this file. For quick iterations on config changes, use additional-config.conf.
+# For permanent ones, please upstream the change to Canton repo.
+
 include required(file("/app/storage.conf"))
 
 canton {
diff --git a/cluster/images/canton-sequencer/Dockerfile b/cluster/images/canton-sequencer/Dockerfile
@@ -13,3 +13,9 @@ EXPOSE 5010
 EXPOSE 10013
 
 COPY app.conf /app/
+
+# Not upstreamed on purpose, this is the Splice part to allow easy overrides from within Splice:
+COPY additional-config.conf /app/
+USER root
+RUN chown -R nonroot:nonroot /app/additional-config.conf
+USER nonroot
diff --git a/cluster/images/canton-sequencer/additional-config.conf b/cluster/images/canton-sequencer/additional-config.conf
@@ -0,0 +1,4 @@
+# Configurations here will be applied after app.conf, and before any ADDITIONAL_CONFIG env vars
+# Please use this file for temporary changes that require quick iterations. Once made permanent,
+# please upstream the change to the Canton repo.
+
diff --git a/cluster/images/canton-sequencer/app.conf b/cluster/images/canton-sequencer/app.conf
@@ -1,3 +1,7 @@
+# This file is frozen, and will be deleted soon (in favor of its copy upstream in Canton repo).
+# Please DO NOT modify this file. For quick iterations on config changes, use additional-config.conf.
+# For permanent ones, please upstream the change to Canton repo.
+
 include required(file("/app/storage.conf"))
 
 canton {
