git.iko.soy/searx
on master help sign in
Merge pull request #1680 from robbyoconnor/patch-1
1bb46e5Adam Tauber
Dockerfile+15−15
compare with master
unifiedsplit
@@ -1,10 +1,17 @@
1FROM alpine:3.10
1FROM alpine:3.10
2+ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
3+EXPOSE 8080
4+VOLUME /etc/searx
5+VOLUME /var/log/uwsgi
2
6
3−ARG VERSION_GITCOMMIT=unknow
7+ARG VERSION_GITCOMMIT=unknown
4−ARG SEARX_GIT_VERSION=unknow
8+ARG SEARX_GIT_VERSION=unknown
5
9
6−ARG SEARX_GID=1000
10+ARG SEARX_GID=977
7−ARG SEARX_UID=1000
11+ARG SEARX_UID=977
12+
13+RUN addgroup -g ${SEARX_GID} searx && \
14+ adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
8
15
9ARG TIMESTAMP_SETTINGS=0
16ARG TIMESTAMP_SETTINGS=0
10ARG TIMESTAMP_UWSGI=0
17ARG TIMESTAMP_UWSGI=0
@@ -16,19 +23,14 @@ ENV INSTANCE_NAME=searx \
16 BASE_URL= \
23 BASE_URL= \
17 MORTY_KEY= \
24 MORTY_KEY= \
18 MORTY_URL=
25 MORTY_URL=
19−EXPOSE 8080
20−VOLUME /etc/searx
21−VOLUME /var/log/uwsgi
22
26
23WORKDIR /usr/local/searx
27WORKDIR /usr/local/searx
24
28
25−RUN addgroup -g ${SEARX_GID} searx && \
26− adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
27
29
28COPY requirements.txt ./requirements.txt
30COPY requirements.txt ./requirements.txt
29
31
30−RUN apk -U upgrade \
32+RUN apk upgrade --no-cache \
31− && apk add -t build-dependencies \
33+ && apk add --no-cache -t build-dependencies \
32 build-base \
34 build-base \
33 py3-setuptools \
35 py3-setuptools \
34 python3-dev \
36 python3-dev \
@@ -38,7 +40,7 @@ RUN apk -U upgrade \
38 openssl-dev \
40 openssl-dev \
39 tar \
41 tar \
40 git \
42 git \
41− && apk add \
43+ && apk add --no-cache \
42 ca-certificates \
44 ca-certificates \
43 su-exec \
45 su-exec \
44 python3 \
46 python3 \
@@ -50,8 +52,7 @@ RUN apk -U upgrade \
50 uwsgi-python3 \
52 uwsgi-python3 \
51 && pip3 install --upgrade pip \
53 && pip3 install --upgrade pip \
52 && pip3 install --no-cache -r requirements.txt \
54 && pip3 install --no-cache -r requirements.txt \
53− && apk del build-dependencies \
55+ && apk del build-dependencies
54− && rm -f /var/cache/apk/*
55
56
56COPY --chown=searx:searx . .
57COPY --chown=searx:searx . .
57
58
@@ -62,7 +63,6 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
62 echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
63 echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
63 fi
64 fi
64
65
65−ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
66
66
67# Keep this argument at the end since it change each time
67# Keep this argument at the end since it change each time
68ARG LABEL_DATE=
68ARG LABEL_DATE=