Remove unnecessary supervisord from Dockerfile
This commit is contained in:
parent
45b68e873d
commit
121696ec01
|
@ -1,10 +1,13 @@
|
||||||
FROM ubuntu:trusty
|
FROM ubuntu:trusty
|
||||||
|
|
||||||
CMD ["supervisord"]
|
ENTRYPOINT /usr/local/bin/pyircbot
|
||||||
|
WORKDIR /srv/bot/
|
||||||
|
CMD ["-c config.json"]
|
||||||
|
|
||||||
RUN sed -i -e 's/archive.ubuntu.com/mirrors.digitalocean.com/' /etc/apt/sources.list ; \
|
RUN useradd bot ; \
|
||||||
|
sed -i -e 's/archive.ubuntu.com/mirrors.digitalocean.com/' /etc/apt/sources.list ; \
|
||||||
apt-get update ; \
|
apt-get update ; \
|
||||||
apt-get install -y python3 python3-setuptools python3-requests curl unzip sqlite3 supervisor ; \
|
apt-get install -y python3 python3-setuptools python3-requests curl unzip sqlite3 ; \
|
||||||
easy_install3 pip ; \
|
easy_install3 pip ; \
|
||||||
pip3 install praw pytz ; \
|
pip3 install praw pytz ; \
|
||||||
curl -o /tmp/bitcoinrpc.zip https://codeload.github.com/dpedu/python-bitcoinrpc/zip/master ; \
|
curl -o /tmp/bitcoinrpc.zip https://codeload.github.com/dpedu/python-bitcoinrpc/zip/master ; \
|
||||||
|
@ -14,8 +17,6 @@ RUN sed -i -e 's/archive.ubuntu.com/mirrors.digitalocean.com/' /etc/apt/sources.
|
||||||
useradd bot ; \
|
useradd bot ; \
|
||||||
mkdir /srv/bot ; \
|
mkdir /srv/bot ; \
|
||||||
chown bot /srv/bot ; \
|
chown bot /srv/bot ; \
|
||||||
echo "[supervisord]" > /etc/supervisor/conf.d/supervisor.conf ; \
|
|
||||||
echo "nodaemon=true" >> /etc/supervisor/conf.d/supervisor.conf ; \
|
|
||||||
rm -rf /var/lib/apt/lists/* /tmp/bitcoinrpc.zip /tmp/python-bitcoinrpc-master
|
rm -rf /var/lib/apt/lists/* /tmp/bitcoinrpc.zip /tmp/python-bitcoinrpc-master
|
||||||
|
|
||||||
COPY . /tmp/pyircbot/
|
COPY . /tmp/pyircbot/
|
||||||
|
@ -23,6 +24,7 @@ COPY . /tmp/pyircbot/
|
||||||
RUN cd /tmp/pyircbot/ ; \
|
RUN cd /tmp/pyircbot/ ; \
|
||||||
python3 setup.py install ; \
|
python3 setup.py install ; \
|
||||||
su -c "cp -r /tmp/pyircbot/examples/config.json /tmp/pyircbot/examples/data/ /srv/bot/" bot ; \
|
su -c "cp -r /tmp/pyircbot/examples/config.json /tmp/pyircbot/examples/data/ /srv/bot/" bot ; \
|
||||||
cp examples/docker/pyircbot.conf /etc/supervisor/conf.d/pyircbot.conf ; \
|
|
||||||
cd / ; \
|
cd / ; \
|
||||||
rm -rf /tmp/pyircbot
|
rm -rf /tmp/pyircbot
|
||||||
|
|
||||||
|
USER bot
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
[program:pyircbot3]
|
|
||||||
command=pyircbot -c config.json
|
|
||||||
autorestart=true
|
|
||||||
user=bot
|
|
||||||
directory=/srv/bot/
|
|
Loading…
Reference in New Issue