summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-02-08 10:44:33 +0100
committerAdam Tauber <asciimoo@gmail.com>2015-02-08 10:44:33 +0100
commit7c075aa73197030d01b210054488ce99ec861d70 (patch)
tree696960a729c54aa65cb517822b1c25dd53f3355f
parent9492b500703be0a7c57a421d34be723849a60308 (diff)
parent6b8270a230f725d7c85ce2e3c87eaa089570fa85 (diff)
Merge branch 'master' of github.com:asciimoo/searx
-rw-r--r--.travis.yml2
-rw-r--r--Dockerfile21
2 files changed, 22 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 751a0ca68..44340600d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ install:
- "make"
- pip install coveralls
script:
- - "make tests"
+ - "make flake8"
- "make robot"
- "make styles"
- "make grunt"
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..831a429e2
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM debian:stable
+
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends \
+ python-dev python2.7-minimal python-virtualenv \
+ python-pybabel python-pip zlib1g-dev \
+ libxml2-dev libxslt1-dev build-essential \
+ openssl
+
+RUN useradd searx
+
+WORKDIR /app
+RUN pip install uwsgi
+COPY requirements.txt /app/requirements.txt
+RUN pip install -r requirements.txt
+
+COPY . /app
+RUN sed -i -e "s/ultrasecretkey/`openssl rand -hex 16`/g" searx/settings.yml
+
+EXPOSE 5000
+CMD ["/usr/local/bin/uwsgi", "--uid", "searx", "--gid", "searx", "--http", ":5000", "-w", "searx.webapp"]