commit: 2b53ac979d42d431a6e2e257680a7eba66285cb6
parent: b5061b5f0fd2e3058af60038a47676ad26c671e6
Author: Adam Tauber <asciimoo@gmail.com>
Date: Tue, 9 Feb 2016 21:39:48 +0100
Merge pull request #505 from Wonderfall/master
Dockerfile enhancements
Diffstat:
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,11 @@
FROM alpine:3.3
+MAINTAINER searx <https://github.com/asciimoo/searx>
+LABEL description "A privacy-respecting, hackable metasearch engine."
ENV BASE_URL=False IMAGE_PROXY=False
EXPOSE 8888
WORKDIR /usr/local/searx
-CMD ["./run.sh"]
+CMD ["/usr/bin/tini","--","/usr/local/searx/run.sh"]
RUN adduser -D -h /usr/local/searx -s /bin/sh searx searx \
&& echo '#!/bin/sh' >> run.sh \
@@ -15,7 +17,8 @@ RUN adduser -D -h /usr/local/searx -s /bin/sh searx searx \
COPY requirements.txt ./requirements.txt
-RUN apk -U add \
+RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+ && apk -U add \
build-base \
python \
python-dev \
@@ -28,6 +31,7 @@ RUN apk -U add \
openssl \
openssl-dev \
ca-certificates \
+ tini@commuedge \
&& pip install --no-cache -r requirements.txt \
&& apk del \
build-base \