diff --git a/Dockerfile b/Dockerfile index 9041379..856bcf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ -FROM debian:jessy-slim +FROM debian:jessie-slim MAINTAINER KI7SBI Dylan @@ -12,11 +12,12 @@ RUN wget -O /root/ipscbuild http://ip1.dx40.com/dmrlink/ipscbuild RUN chmod 755 /root/ipscbuild RUN /root/ipscbuild #RUN mkdir -p /var/log/supervisor -COPY hb-ipsc-supervise.conf /etc/supervisor/conf.d/hb-ipsc-supervise.conf +#COPY hb-ipsc-supervise.conf /etc/supervisor/conf.d/hb-ipsc-supervise.conf +COPY supervisord.conf /etc/supervisor/supervisord.conf COPY hblink.cfg /opt/hblink/hblink.cfg COPY HB_Bridge.cfg /opt/hblink/HB_Bridge.cfg -COPY dmrlink.cfg /top/dmrlink/bridge/dmrlink.cfg -COPY IPSC_Bridge.cfg /top/dmrlink/bridge/ISPC_Bridge.cfg +COPY dmrlink.cfg /opt/dmrlink/bridge/dmrlink.cfg +COPY IPSC_Bridge.cfg /opt/dmrlink/bridge/ISPC_Bridge.cfg diff --git a/supervisord.conf b/supervisord.conf new file mode 100644 index 0000000..b3cfd59 --- /dev/null +++ b/supervisord.conf @@ -0,0 +1,38 @@ +; supervisor config file + +;[unix_http_server] +;file=/var/run/supervisor.sock ; (the path to the socket file) +;chmod=0700 ; sockef file mode (default 0700) + +[supervisord] +logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) +pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) +childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) +nodaemon=true ;;this is important to be able to run as the docker command + + +; the below section must remain in the config file for RPC +; (supervisorctl/web interface) to work, additional interfaces may be +; added by defining them in separate rpcinterface: sections +;[rpcinterface:supervisor] +;supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +;[supervisorctl] +;serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket + + + +; The [include] section can just contain the "files" setting. This +; setting can list multiple files (separated by whitespace or +; newlines). It can also contain wildcards. The filenames are +; interpreted as relative to this file. Included files *cannot* +; include files themselves. + +;[include] +;files = /etc/supervisor/conf.d/*.conf + +[program:hb_bridge] +command = /opt/hblink/HB_Bridge.py + +[program:ipsc_bridge] +command = /opt/dmrlink/bridge/IPSC_Bridge.py