Skip to content

Commit 9e3aa61

Browse files
author
dcb9
committed
Fix proc signal
1 parent 37f119c commit 9e3aa61

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

dapp/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ RUN apt-get update && \
66
apt-get install -y curl vim-tiny less && \
77
rm -rf /var/lib/apt/lists/*
88

9-
RUN wget https://github.com/mattn/goreman/releases/download/v0.0.10/goreman_linux_amd64.zip && \
10-
unzip -o -d /usr/local/bin goreman_linux_amd64.zip && \
11-
rm goreman_linux_amd64.zip
12-
139
ENV QTUM_RELEASE 0.15.2
1410
ENV QTUM_RELEASE_TAR qtum-${QTUM_RELEASE}-x86_64-linux-gnu.tar.gz
1511

@@ -33,6 +29,7 @@ FROM jeanblanchard/alpine-glibc
3329
# apt-get install -y curl vim-tiny less && \
3430
# rm -rf /var/lib/apt/lists/*
3531

32+
RUN apk --no-cache add supervisor
3633
ENV QTUM_DATADIR /dapp/.qtum
3734
ENV QTUM_RPC_USER qtum
3835
ENV QTUM_RPC_PASS test
@@ -43,9 +40,10 @@ VOLUME /dapp
4340

4441
COPY --from=tools /usr/local/bin /usr/local/bin
4542

43+
4644
COPY qcli /usr/local/bin
4745
COPY qtumd-launch /usr/local/bin
48-
COPY Procfile /Procfile
46+
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
4947

5048
# 9888: qtumportal DApp RPC service
5149
# 9899: qtumportal auth service
@@ -59,4 +57,4 @@ WORKDIR /dapp
5957

6058
# 172.17.0.0/16 is the network submask for docker's bridge network.
6159
# -rpcallowip=172.17.0.0/16 permits RPC access from docker host
62-
CMD mkdir -p $QTUM_DATADIR && goreman -f /Procfile start
60+
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

dapp/Procfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

dapp/supervisord.conf

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[supervisord]
2+
nodaemon=true
3+
stdout_logfile=/dev/stdout
4+
stdout_logfile_maxbytes=0
5+
stdout_events_enabled=true
6+
stderr_events_enabled=true
7+
redirect_stderr=true
8+
9+
[program:qtumd-launch]
10+
command=qtumd-launch
11+
killasgroup=true
12+
stdout_logfile=/dev/stdout
13+
stdout_logfile_maxbytes=0
14+
stdout_events_enabled=true
15+
stderr_events_enabled=true
16+
redirect_stderr=true
17+
18+
[program:portal]
19+
command=qtumportal serve --bind=0.0.0.0 --dev
20+
stdout_logfile=/dev/stdout
21+
stdout_logfile_maxbytes=0
22+
stdout_events_enabled=true
23+
stderr_events_enabled=true
24+
redirect_stderr=true
25+
26+
[program:janus]
27+
command=janus --qtum-rpc="http://%(ENV_QTUM_RPC_USER)s:%(ENV_QTUM_RPC_PASS)s@localhost:3889" --bind=0.0.0.0 --port=23889 --dev
28+
stdout_logfile=/dev/stdout
29+
stdout_logfile_maxbytes=0
30+
stdout_events_enabled=true
31+
stderr_events_enabled=true
32+
redirect_stderr=true

0 commit comments

Comments
 (0)