This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 09a481a47fe67557000492798ebdd085fdefb17a
Author: Croway <federico.mariani.1...@gmail.com>
AuthorDate: Mon Mar 31 12:10:08 2025 +0200
Run cli testsuite on Mac + documentation
---
docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 20 +++++++++++++++++++-
.../apache/camel/test/infra/cli/services/Dockerfile | 2 +-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 3e28f4706ab..5893ab07bd8 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -3894,7 +3894,25 @@ Now, the run command picks the user configuration:
camel run *
----
-The user configuration file is stored in `~/.camel-jbang-user.properties`
+=== Configuration Locations
+
+Camel JBang uses two possible configuration files:
+
+- Global configuration: ~/.camel-jbang-user.properties
+- Local configuration: ./camel-jbang-user.properties
+
+=== Configuration Precedence
+
+When both files exist, the local configuration takes precedence over the
global configuration.
+
+=== Using Configuration Commands
+
+All camel config commands target the global configuration by default. To work
with the local configuration instead, add the `--global=false` flag:
+[source,bash]
+----
+camel config <command> --global=false
+----
+This directs all configuration changes to the local
./camel-jbang-user.properties file.
IMPORTANT: You cannot use both a set version via `camel config set` and also a
version specified via `--camel-version` option,
i.e., the following is not possible:
diff --git
a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
index faa93c3bbbc..fc4719bb20a 100644
---
a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
+++
b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
@@ -39,7 +39,7 @@ ADD 99-ssh-jbang.conf /etc/ssh/sshd_config.d/
RUN sed -i "s|#auth sufficient pam_wheel.so trust use_uid|auth
sufficient pam_wheel.so trust use_uid|g" /etc/pam.d/su
#create new user
-RUN groupadd -g $CUSTOM_GID jbang \
+RUN groupadd -f -g $CUSTOM_GID jbang \
&& useradd -u $CUSTOM_UID -g $CUSTOM_GID -s /bin/bash jbang
#to avoid prompt su - root password
