fix errbot stop_signal

2024-06-20 22:08:39 +00:00 · 2017-01-22 22:21:00 +08:00 · 2017-01-22 22:21:00 +08:00 · 57a9178321
commit 57a9178321
parent 1168e58d77
6 changed files with 10 additions and 4 deletions
--- 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 \
--- 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
--- 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 \
--- 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
--- 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
--- 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