on master help sign in
some other minor tweaks to move stuff very unlikely to change to the top in efforts to delay cache invalidation
dae5bcfRobert O'Connor
Dockerfile+10−10
@@ -1,10 +1,16 @@
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
6+RUN addgroup -g ${SEARX_GID} searx && \
7+ adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
2
8
3−ARG VERSION_GITCOMMIT=unknow
9+ARG VERSION_GITCOMMIT=unknown
4−ARG SEARX_GIT_VERSION=unknow
10+ARG SEARX_GIT_VERSION=unknown
5
11
6−ARG SEARX_GID=1000
12+ARG SEARX_GID=977
7−ARG SEARX_UID=1000
13+ARG SEARX_UID=977
8
14
9ARG TIMESTAMP_SETTINGS=0
15ARG TIMESTAMP_SETTINGS=0
10ARG TIMESTAMP_UWSGI=0
16ARG TIMESTAMP_UWSGI=0
@@ -14,14 +20,9 @@ ARG LABEL_VCS_URL=
14ENV BASE_URL= \
20ENV BASE_URL= \
15 MORTY_KEY= \
21 MORTY_KEY= \
16 MORTY_URL=
22 MORTY_URL=
17−EXPOSE 8080
18−VOLUME /etc/searx
19−VOLUME /var/log/uwsgi
20
23
21WORKDIR /usr/local/searx
24WORKDIR /usr/local/searx
22
25
23−RUN addgroup -g ${SEARX_GID} searx && \
24− adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
25
26
26COPY requirements.txt ./requirements.txt
27COPY requirements.txt ./requirements.txt
27
28
@@ -59,7 +60,6 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
59 echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
60 echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
60 fi
61 fi
61
62
62−ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
63
63
64# Keep this argument at the end since it change each time
64# Keep this argument at the end since it change each time
65ARG LABEL_DATE=
65ARG LABEL_DATE=