docker: introduce KILLBILL_QUEUE_CREATOR_NAME to configure the creato…

…r name This fixes #27. Signed-off-by: Pierre-Alexandre Meyer <[email protected]>
killbill · Jan 8, 2016 · f31e56e · f31e56e
1 parent ada4f18
commit f31e56e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -51,6 +51,7 @@ Kill Bill specific environment variables:
   - `KILLBILL_METRICS_GRAPHITE` (default `false`)
   - `KILLBILL_METRICS_GRAPHITE_HOST` (default `localhost`)
   - `KILLBILL_METRICS_GRAPHITE_PORT` (default `2003`)
+  - `KILLBILL_QUEUE_CREATOR_NAME` (no default is specified, Kill Bill will use the hostname)
 
 Kaui specific environment variables:
 
@@ -88,7 +89,7 @@ To cleanup containers and images:
 To run it:
 
     make run-container
-    
+
 To publish an image:
 
 ```
@@ -161,13 +162,13 @@ You can also install Kaui in a similar fashion:
   ```
   create database kaui;
   ```
-  
+
   * Add the [DDL](https://raw.githubusercontent.com/killbill/killbill-admin-ui/master/db/ddl.sql) for KAUI
-  
-  * Add the initial `admin` user in the `KAUI` database: `insert into kaui_allowed_users (kb_username, description, created_at, updated_at) values ('admin', 'super admin', NOW(), NOW());` 
-  
+
+  * Add the initial `admin` user in the `KAUI` database: `insert into kaui_allowed_users (kb_username, description, created_at, updated_at) values ('admin', 'super admin', NOW(), NOW());`
+
   * Start the KAUI container:
-  
+
   ```
   docker run -tid \
              --name kaui_0_7_0 \

diff --git a/docker/templates/killbill/latest/Dockerfile b/docker/templates/killbill/latest/Dockerfile
@@ -18,6 +18,8 @@ ENV KILLBILL_METRICS_GRAPHITE false
 ENV KILLBILL_METRICS_GRAPHITE_HOST localhost
 ENV KILLBILL_METRICS_GRAPHITE_PORT 2003
 
+ENV KILLBILL_QUEUE_CREATOR_NAME ''
+
 USER root
 
 COPY ./killbill.sh /etc/init.d/killbill.sh

diff --git a/docker/templates/killbill/latest/kpm.yml.erb b/docker/templates/killbill/latest/kpm.yml.erb
@@ -35,6 +35,7 @@ killbill:
     org.killbill.notificationq.analytics.tableName: analytics_notifications
     org.killbill.osgi.bundle.install.dir: <%= ENV['KILLBILL_HOME'] %>/bundles
     org.killbill.osgi.root.dir: <%= ENV['KILLBILL_HOME'] %>/felix-cache
+    org.killbill.queue.creator.name: <%= ENV['KILLBILL_QUEUE_CREATOR_NAME'] %>
     org.killbill.server.baseUrl: http://localhost:8080
     org.killbill.server.properties: file://<%= ENV['KILLBILL_CONFIG'] %>/killbill.properties
     org.killbill.server.http.gzip: true