[activemq-artemis] 02/02: NO-JIRA few small usability fixes

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit cd1e9822f597b33474883c3c09397b0a7ef82f8c
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Sat Sep 23 22:53:49 2023 -0500

    NO-JIRA few small usability fixes
---
 artemis-docker/docker-run.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/artemis-docker/docker-run.sh b/artemis-docker/docker-run.sh
index c2b02163d5..f0f806c3c0 100755
--- a/artemis-docker/docker-run.sh
+++ b/artemis-docker/docker-run.sh
@@ -16,11 +16,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
-
 # This is the entry point for the docker images.
-# This file is executed when docker run is called.
-
+# This file is executed when "docker container create" or "docker run" is called.
 
 set -e
 
@@ -34,19 +31,15 @@ else
   LOGIN_OPTION="--require-login"
 fi
 
-CREATE_ARGUMENTS="--user ${ARTEMIS_USER} --password ${ARTEMIS_PASSWORD} --silent ${LOGIN_OPTION} ${EXTRA_ARGS}"
-
-echo CREATE_ARGUMENTS=${CREATE_ARGUMENTS}
-
 if ! [ -f ./etc/broker.xml ]; then
+    CREATE_ARGUMENTS="--user ${ARTEMIS_USER} --password ${ARTEMIS_PASSWORD} --silent ${LOGIN_OPTION} ${EXTRA_ARGS}"
+    echo CREATE_ARGUMENTS=${CREATE_ARGUMENTS}
     /opt/activemq-artemis/bin/artemis create ${CREATE_ARGUMENTS} .
     if [ -d ./etc-override ]; then
         for file in `ls ./etc-override`; do echo copying file to etc folder: $file; cp ./etc-override/$file ./etc || :; done
     fi
 else
-    echo "broker already created, ignoring creation"
+    echo "skipping broker instance creation; instance already exists"
 fi
 
-exec ./bin/artemis "$@"
-
-
+exec ./bin/artemis "$@"
\ No newline at end of file