From 57a917832187ff96deee68d5293f62d674186ddc Mon Sep 17 00:00:00 2001 From: kev Date: Sun, 22 Jan 2017 22:21:00 +0800 Subject: [PATCH] fix errbot stop_signal --- errbot/Dockerfile | 3 +-- errbot/README.md | 4 ++++ errbot/arm/Dockerfile | 3 +-- errbot/arm/docker-compose.yml | 1 + errbot/data/config.py | 2 ++ errbot/docker-compose.yml | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/errbot/Dockerfile b/errbot/Dockerfile index e35a67f..18f2fa0 100644 --- a/errbot/Dockerfile +++ b/errbot/Dockerfile @@ -10,6 +10,7 @@ RUN set -xe \ build-base \ git \ libffi-dev \ + openssl \ openssl-dev \ python3 \ python3-dev \ @@ -22,8 +23,6 @@ RUN set -xe \ slackclient \ sleekxmpp \ && adduser -s /bin/sh -D errbot \ - && cd /home/errbot \ - && wget http://errbot.io/en/latest/_downloads/config-template.py \ && apk del --purge build-base \ libffi-dev \ openssl-dev \ diff --git a/errbot/README.md b/errbot/README.md index eeac2a4..cffb2d1 100644 --- a/errbot/README.md +++ b/errbot/README.md @@ -6,6 +6,7 @@ errbot [Errbot][1] is a chatbot, a daemon that connects to your favorite chat service and brings your tools into the conversation. + ## docker-compose.yml ```yaml @@ -26,6 +27,8 @@ $ vim data/config.py $ docker-compose up -d ``` +Check the example config.py [here][2]. + ## chat-ops ``` @@ -51,3 +54,4 @@ errbot [8:52 PM] ``` [1]: http://errbot.io +[2]: http://errbot.io/en/latest/_downloads/config-template.py diff --git a/errbot/arm/Dockerfile b/errbot/arm/Dockerfile index 956f07c..6b1b62d 100644 --- a/errbot/arm/Dockerfile +++ b/errbot/arm/Dockerfile @@ -10,6 +10,7 @@ RUN set -xe \ build-base \ git \ libffi-dev \ + openssl \ openssl-dev \ python3 \ python3-dev \ @@ -22,8 +23,6 @@ RUN set -xe \ slackclient \ sleekxmpp \ && adduser -s /bin/sh -D errbot \ - && cd /home/errbot \ - && wget http://errbot.io/en/latest/_downloads/config-template.py \ && apk del --purge build-base \ libffi-dev \ openssl-dev \ diff --git a/errbot/arm/docker-compose.yml b/errbot/arm/docker-compose.yml index 9bb1635..539b3c4 100644 --- a/errbot/arm/docker-compose.yml +++ b/errbot/arm/docker-compose.yml @@ -2,5 +2,6 @@ errbot: image: easypi/errbot-arm volumes: - ./data:/home/errbot + stop_signal: SIGINT tty: yes restart: always diff --git a/errbot/data/config.py b/errbot/data/config.py index c6707b3..9d6236b 100644 --- a/errbot/data/config.py +++ b/errbot/data/config.py @@ -20,3 +20,5 @@ BOT_LOG_FILE = '/home/errbot/errbot.log' BOT_LOG_LEVEL = logging.DEBUG BOT_ADMINS = ('@master', ) + +AUTOINSTALL_DEPS = True diff --git a/errbot/docker-compose.yml b/errbot/docker-compose.yml index 37548aa..7b475f2 100644 --- a/errbot/docker-compose.yml +++ b/errbot/docker-compose.yml @@ -2,5 +2,6 @@ errbot: image: vimagick/errbot volumes: - ./data:/home/errbot + stop_signal: SIGINT tty: yes restart: always