From b917000b5d567d73c7eb4fa90c83ef73200c1ab6 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 24 Mar 2015 11:27:35 +0000 Subject: [PATCH 1/4] A dockerfile. --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a70da15 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM ubuntu +MAINTAINER Rob Haswell + +RUN apt-get -qqy update +RUN apt-get -qqy upgrade +RUN apt-get -qqy install python-pip + +ADD dropbot requirements.txt /usr/src/app/ +WORKDIR /usr/src/app + +RUN pip install -r requirements.txt + +CMD ["python", "dropbot/cli.py", "-c", "env"] From 5927d78b7d791cc0c3f7f28bab2811ff5cc8ff75 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 24 Mar 2015 12:20:13 +0000 Subject: [PATCH 2/4] Mention Docker in README.md --- Dockerfile | 3 ++- MANIFEST.in | 1 + README.md | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a70da15..b702db3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,10 @@ RUN apt-get -qqy update RUN apt-get -qqy upgrade RUN apt-get -qqy install python-pip -ADD dropbot requirements.txt /usr/src/app/ +ADD . /usr/src/app/ WORKDIR /usr/src/app +RUN python setup.py install RUN pip install -r requirements.txt CMD ["python", "dropbot/cli.py", "-c", "env"] diff --git a/MANIFEST.in b/MANIFEST.in index bb3ec5f..fa9bd66 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ include README.md +include dropbot/data/* diff --git a/README.md b/README.md index 710f841..8afb1bc 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,13 @@ Setup Dropbot is designed to run on Heroku, but can be ran locally using ```python dropbot\cli.py -c env``` +Docker +^^^^^^ + +Dropbot can be run on Docker using the image ``robhaswell/docker``: + +``docker run -ti -e DROPBOT_JID='user@server' -e DROPBOT_PASSWORD='password' -e DROPBOT_ROOMS='room@server' robhaswell/dropbot`` + Configuration ------------- From 9337737ceef5d68aaa325e27c086f53dc1b75253 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 24 Mar 2015 12:21:07 +0000 Subject: [PATCH 3/4] Markdown is cancer. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8afb1bc..7b17184 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Setup Dropbot is designed to run on Heroku, but can be ran locally using ```python dropbot\cli.py -c env``` Docker -^^^^^^ +------ Dropbot can be run on Docker using the image ``robhaswell/docker``: From 56a46c650573195a5f2f2b9546330d5da0da9a21 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 24 Mar 2015 12:22:03 +0000 Subject: [PATCH 4/4] Actually I should just learn Markdown. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b17184..1839efc 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Docker Dropbot can be run on Docker using the image ``robhaswell/docker``: -``docker run -ti -e DROPBOT_JID='user@server' -e DROPBOT_PASSWORD='password' -e DROPBOT_ROOMS='room@server' robhaswell/dropbot`` + docker run -ti -e DROPBOT_JID='user@server' -e DROPBOT_PASSWORD='password' -e DROPBOT_ROOMS='room@server' robhaswell/dropbot Configuration -------------