[pulsar] branch master updated: [fix][misc] Update SQL config to use composed contaiiners (#11006)

[tison]

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

tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new e927839efc7 [fix][misc] Update SQL config to use composed contaiiners 
(#11006)
e927839efc7 is described below

commit e927839efc7c10ee40808a697d4dc4cd6d611d23
Author: mipper <evanscl...@hotmail.com>
AuthorDate: Fri Dec 9 04:51:24 2022 +0000

    [fix][misc] Update SQL config to use composed contaiiners (#11006)
    
    Co-authored-by: tison <wander4...@gmail.com>
---
 docker-compose/kitchen-sink/docker-compose.yml     |  3 ++-
 .../scripts/apply-config-from-env-with-prefix.py   | 24 ++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/docker-compose/kitchen-sink/docker-compose.yml 
b/docker-compose/kitchen-sink/docker-compose.yml
index fab7c5b9f1c..e670f66b620 100644
--- a/docker-compose/kitchen-sink/docker-compose.yml
+++ b/docker-compose/kitchen-sink/docker-compose.yml
@@ -377,6 +377,7 @@ services:
       zookeeperServers: zk1:2181,zk2:2181,zk3:2181
       configurationStoreServers: zk1:2181,zk2:2181,zk3:2181
       pulsar.zookeeper-uri: zk1:2181,zk2:2181,zk3:2181
+      pulsar.web-service-url: http://proxy1:8080
       coordinator: "true"
     volumes:
       - 
./../../docker/pulsar/scripts/apply-config-from-env-with-prefix.py:/pulsar/bin/apply-config-from-env-with-prefix.py
@@ -416,4 +417,4 @@ services:
       PASSWORD: "pulsar"
       LOG_LEVEL: "DEBUG"
     networks:
-      pulsar:
\ No newline at end of file
+      pulsar:
diff --git a/docker/pulsar/scripts/apply-config-from-env-with-prefix.py 
b/docker/pulsar/scripts/apply-config-from-env-with-prefix.py
index 0890f1b8d7b..58f6c989750 100755
--- a/docker/pulsar/scripts/apply-config-from-env-with-prefix.py
+++ b/docker/pulsar/scripts/apply-config-from-env-with-prefix.py
@@ -18,17 +18,25 @@
 # under the License.
 #
 
-##
-## Edit a properties config file and replace values based on
-## the ENV variables
-## export prefix_my-key=new-value
-## ./apply-config-from-env-with-prefix prefix_ file.conf
-##
+############################################################
+# Edit a properties config file and replace values based on
+# the ENV variables
+# export prefix_my-key=new-value
+# ./apply-config-from-env-with-prefix prefix_ file.conf
+#
+# Environment variables that are prefixed with the command
+# line prefix will be used to updated file properties if
+# they exist and create new ones if they don't.
+#
+# Environment variables not prefixed will be used only to
+# update if they exist and ignored if they don't.
+############################################################
 
-import os, sys
+import os
+import sys
 
 if len(sys.argv) < 3:
-    print('Usage: %s' % (sys.argv[0]))
+    print('Usage: %s <PREFIX> <FILE> [<FILE>...]' % (sys.argv[0]))
     sys.exit(1)
 
 # Always apply env config to env scripts as well