From 7f51eedee7b07a434ce1e268ec3e26556bcd5c9a Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 14 Sep 2015 21:41:26 -0700 Subject: [PATCH] Delete apt lists to save space, consolidate run steps. Also fix dockerfile after gitlab upgrade --- examples/docker/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/docker/Dockerfile b/examples/docker/Dockerfile index dd9be15..4f7b16f 100644 --- a/examples/docker/Dockerfile +++ b/examples/docker/Dockerfile @@ -1,22 +1,23 @@ FROM ubuntu:trusty RUN apt-get update ; \ - apt-get install -y python3 python3-setuptools python3-requests python3-yaml wget sqlite3 supervisor - -RUN easy_install3 pip ; \ + apt-get install -y python3 python3-setuptools python3-requests python3-yaml wget sqlite3 supervisor ; \ + easy_install3 pip ; \ pip3 install praw pytz ; \ useradd bot ; \ cd /tmp ; \ wget http://gitlab.xmopx.net/dave/pyircbot3/repository/archive.tar.gz ; \ - tar zxvf archive.tar.gz ; \ - rm archive.tar.gz ;\ + mkdir pyircbot.git ;\ + tar zxvf archive.tar.gz -C pyircbot.git --strip-components=1 ; \ + rm archive.tar.gz ; \ cd pyircbot3.git/ ; \ python3 setup.py install ; \ mkdir /srv/bot ; \ chown bot /srv/bot ; \ echo "[supervisord]" > /etc/supervisor/conf.d/supervisor.conf ; \ echo "nodaemon=true" >> /etc/supervisor/conf.d/supervisor.conf ; \ - su -c "cp -r /tmp/pyircbot3.git/examples/config.json /tmp/pyircbot3.git/examples/data/ /srv/bot/" bot + su -c "cp -r /tmp/pyircbot3.git/examples/config.json /tmp/pyircbot3.git/examples/data/ /srv/bot/" bot ; \ + rm -rf /var/lib/apt/lists/* ADD pyircbot.conf /etc/supervisor/conf.d/pyircbot.conf