[pulsar-manager] branch master updated: Fixed docker package (#332)

[gu...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 36069bc  Fixed docker package (#332)
36069bc is described below

commit 36069bca283718bcb2488447cee337be2f8b0ad6
Author: Guangning <gu...@apache.org>
AuthorDate: Wed Sep 9 18:26:50 2020 +0800

    Fixed docker package (#332)
    
    
    ### Motivation
    
    Fixed docker package for support bkvm
    
    ### Modifications
    
    * Fixed docker package
    
    ### Verifying this change
    
    - [ ] Make sure that the change passes the `./gradlew build` checks.
---
 VERSION                                    | 2 +-
 docker/default.conf                        | 4 ++++
 docker/entrypoint.sh                       | 8 ++++----
 docker/supervisord-configuration-file.conf | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 0ea3a94..341cf11 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.0
\ No newline at end of file
diff --git a/docker/default.conf b/docker/default.conf
index 74400d8..c9f419b 100644
--- a/docker/default.conf
+++ b/docker/default.conf
@@ -37,6 +37,10 @@ server {
     location /lookup {
       proxy_pass http://localhost:7750;
     }
+
+    location /bkvm {
+      proxy_pass http://localhost:7750;
+    }
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index e88309e..6764e36 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -18,6 +18,9 @@
 # under the License.
 #
 
+
+if [[ "$URL" = "jdbc:postgresql://127.0.0.1:5432/pulsar_manager" ]]
+then
 echo 'Starting PostGreSQL Server'
 
 addgroup pulsar
@@ -28,10 +31,7 @@ chown -R pulsar:pulsar /data
 chown pulsar:pulsar /pulsar-manager/init_db.sql
 chmod 750 /data
 
-su - pulsar
-if [[ "$URL" = "jdbc:postgresql://127.0.0.1:5432/pulsar_manager" ]]
-then
-/bin/sh /pulsar-manager/startup.sh
+su - pulsar -s /bin/sh /pulsar-manager/startup.sh
 fi
 
 echo 'Starting Pulsar Manager Front end'
diff --git a/docker/supervisord-configuration-file.conf b/docker/supervisord-configuration-file.conf
index ac94c47..b238852 100644
--- a/docker/supervisord-configuration-file.conf
+++ b/docker/supervisord-configuration-file.conf
@@ -28,5 +28,6 @@ minfds=1024
 minprocs=200
 
 [program:pulsar-manager-backend]
+directory=/pulsar-manager/pulsar-manager
 command = /pulsar-manager/pulsar-manager/bin/pulsar-manager  --spring.config.location=%(ENV_SPRING_CONFIGURATION_FILE)s
 user = root