Remove ssh, general improvements
This commit is contained in:
parent
e93a180d9b
commit
860ff9cd0d
|
@ -19,11 +19,13 @@ RUN apt-get update ; \
|
||||||
chmod +x /run_deluge.sh
|
chmod +x /run_deluge.sh
|
||||||
|
|
||||||
# Install SSH server
|
# Install SSH server
|
||||||
RUN mkdir /var/run/sshd ; \
|
#RUN mkdir /var/run/sshd ; \
|
||||||
apt-get -y install openssh-server
|
# apt-get -y install openssh-server
|
||||||
|
|
||||||
# Install supervisor, vnstat, & start script
|
# Install supervisor, vnstat, & start script
|
||||||
RUN apt-get -y install supervisor vnstat
|
RUN apt-get -y install supervisor vnstat ; mkdir /start.d
|
||||||
|
COPY deluged.conf /etc/supervisor/conf.d/deluged.conf
|
||||||
|
COPY vnstatd.conf etc/supervisor/conf.d/vnstatd.conf
|
||||||
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
COPY start /start
|
COPY start /start
|
||||||
RUN chmod +x /start ; \
|
RUN chmod +x /start ; \
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
[program:deluged]
|
||||||
|
autorestart=true
|
||||||
|
command=/run_deluge.sh
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# run everything in start.d
|
||||||
|
find /start.d -type f -executable -exec {} \;
|
||||||
|
|
||||||
|
# Cleanly kill supervisor when container is stopped
|
||||||
|
trap 'kill $(jobs -p)' EXIT
|
||||||
|
|
||||||
# start services
|
# start services
|
||||||
supervisord
|
supervisord
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,3 @@
|
||||||
[supervisord]
|
[supervisord]
|
||||||
nodaemon=true
|
nodaemon=true
|
||||||
|
|
||||||
[program:sshd]
|
|
||||||
command=/usr/sbin/sshd -D
|
|
||||||
autorestart=true
|
|
||||||
|
|
||||||
[program:deluged]
|
|
||||||
autorestart=true
|
|
||||||
command=/run_deluge.sh
|
|
||||||
|
|
||||||
[program:cron]
|
|
||||||
command=/usr/sbin/cron -f
|
|
||||||
autorestart=true
|
|
||||||
|
|
||||||
[program:vnstatd]
|
|
||||||
command=/bin/su -c '/usr/sbin/vnstatd -n' deluge
|
|
||||||
autorestart=true
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
[program:vnstatd]
|
||||||
|
command=/bin/su -c '/usr/sbin/vnstatd -n' deluge
|
||||||
|
autorestart=true
|
||||||
|
|
Loading…
Reference in New Issue