Pārlūkot izejas kodu

Merge pull request #505 from Wonderfall/master

Dockerfile enhancements
Adam Tauber 9 gadus atpakaļ
vecāks
revīzija
2b53ac979d
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6
    2
      Dockerfile

+ 6
- 2
Dockerfile Parādīt failu

1
 FROM alpine:3.3
1
 FROM alpine:3.3
2
+MAINTAINER searx <https://github.com/asciimoo/searx>
3
+LABEL description "A privacy-respecting, hackable metasearch engine."
2
 
4
 
3
 ENV BASE_URL=False IMAGE_PROXY=False
5
 ENV BASE_URL=False IMAGE_PROXY=False
4
 EXPOSE 8888
6
 EXPOSE 8888
5
 WORKDIR /usr/local/searx
7
 WORKDIR /usr/local/searx
6
-CMD ["./run.sh"]
8
+CMD ["/usr/bin/tini","--","/usr/local/searx/run.sh"]
7
 
9
 
8
 RUN adduser -D -h /usr/local/searx -s /bin/sh searx searx \
10
 RUN adduser -D -h /usr/local/searx -s /bin/sh searx searx \
9
  && echo '#!/bin/sh' >> run.sh \
11
  && echo '#!/bin/sh' >> run.sh \
15
 
17
 
16
 COPY requirements.txt ./requirements.txt
18
 COPY requirements.txt ./requirements.txt
17
 
19
 
18
-RUN apk -U add \
20
+RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
21
+ && apk -U add \
19
     build-base \
22
     build-base \
20
     python \
23
     python \
21
     python-dev \
24
     python-dev \
28
     openssl \
31
     openssl \
29
     openssl-dev \
32
     openssl-dev \
30
     ca-certificates \
33
     ca-certificates \
34
+    tini@commuedge \
31
  && pip install --no-cache -r requirements.txt \
35
  && pip install --no-cache -r requirements.txt \
32
  && apk del \
36
  && apk del \
33
     build-base \
37
     build-base \