Skip to content

Commit

Permalink
Fixed docker package (#332)
Browse files Browse the repository at this point in the history
### Motivation

Fixed docker package for support bkvm

### Modifications

* Fixed docker package

### Verifying this change

- [ ] Make sure that the change passes the `./gradlew build` checks.
  • Loading branch information
tuteng authored Sep 9, 2020
1 parent f600db6 commit 36069bc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.0
0.2.0
4 changes: 4 additions & 0 deletions docker/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
1 change: 1 addition & 0 deletions docker/supervisord-configuration-file.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 36069bc

Please sign in to comment.