diff --git a/VERSION b/VERSION index 0ea3a944..341cf11f 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 74400d86..c9f419b8 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 e88309e1..6764e363 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 ac94c47c..b238852d 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