From 65e652475bd2282ad1fe5ac5409372d8e23e10bb Mon Sep 17 00:00:00 2001 From: Flix Date: Mon, 30 Sep 2024 12:11:51 +0200 Subject: [PATCH] QPID-8679: [Broker-J] Copy nested configuration files in work-init and work-override (#244) --- qpid-docker/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qpid-docker/entrypoint.sh b/qpid-docker/entrypoint.sh index 8af2430a58..044a9bcf6e 100644 --- a/qpid-docker/entrypoint.sh +++ b/qpid-docker/entrypoint.sh @@ -23,14 +23,14 @@ set -e if ! [ -f ./work/config.json ]; then if [ -d ./work-init ]; then - for file in `ls ./work-init`; do echo copying file to work folder: $file; cp ./work-init/$file ./work || :; done + for file in `ls ./work-init`; do echo copying file to work folder: $file; cp -r ./work-init/$file ./work || :; done fi sed -i "s/QPID_ADMIN_USER/${QPID_ADMIN_USER}/g" /qpid-broker-j/work/broker.acl if [ -d ./work-override ]; then - for file in `ls ./work-override`; do echo copying file to work folder: $file; cp ./work-override/$file ./work || :; done + for file in `ls ./work-override`; do echo copying file to work folder: $file; cp -r ./work-override/$file ./work || :; done fi else echo "skipping broker instance creation; instance already exists" fi -exec java -server $JAVA_GC $JAVA_MEM $JAVA_OPTS -DQPID_HOME=/qpid-broker-j -DQPID_WORK=/qpid-broker-j/work -cp "/qpid-broker-j/lib/*" org.apache.qpid.server.Main \ No newline at end of file +exec java -server $JAVA_GC $JAVA_MEM $JAVA_OPTS -DQPID_HOME=/qpid-broker-j -DQPID_WORK=/qpid-broker-j/work -cp "/qpid-broker-j/lib/*" org.apache.qpid.server.Main