git.iko.soy/searx
on master help sign in
Merge pull request #2725 from 3nprob/optimize-docker-build
647c3fbNoémi Ványi
Dockerfile+9−10
compare with master
unifiedsplit
@@ -4,21 +4,12 @@ EXPOSE 8080
4VOLUME /etc/searx
4VOLUME /etc/searx
5VOLUME /var/log/uwsgi
5VOLUME /var/log/uwsgi
6
6
7−ARG GIT_URL=unknown
8−ARG VERSION_GITCOMMIT=unknown
9−ARG SEARX_GIT_VERSION=unknown
10−
11ARG SEARX_GID=977
7ARG SEARX_GID=977
12ARG SEARX_UID=977
8ARG SEARX_UID=977
13
9
14RUN addgroup -g ${SEARX_GID} searx && \
10RUN addgroup -g ${SEARX_GID} searx && \
15 adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
11 adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
16
12
17−ARG TIMESTAMP_SETTINGS=0
18−ARG TIMESTAMP_UWSGI=0
19−ARG LABEL_VCS_REF=
20−ARG LABEL_VCS_URL=
21−
22ENV INSTANCE_NAME=searx \
13ENV INSTANCE_NAME=searx \
23 AUTOCOMPLETE= \
14 AUTOCOMPLETE= \
24 BASE_URL= \
15 BASE_URL= \
@@ -60,6 +51,10 @@ RUN apk upgrade --no-cache \
60
51
61COPY --chown=searx:searx . .
52COPY --chown=searx:searx . .
62
53
54+ARG TIMESTAMP_SETTINGS=0
55+ARG TIMESTAMP_UWSGI=0
56+ARG VERSION_GITCOMMIT=unknown
57+
63RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
58RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
64 touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml; \
59 touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml; \
65 touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini; \
60 touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini; \
@@ -70,8 +65,12 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
70 -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \
65 -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \
71 -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+
66 -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+
72
67
73−# Keep this argument at the end since it change each time
68+# Keep these arguments at the end to prevent redundant layer rebuilds
74ARG LABEL_DATE=
69ARG LABEL_DATE=
70+ARG GIT_URL=unknown
71+ARG SEARX_GIT_VERSION=unknown
72+ARG LABEL_VCS_REF=
73+ARG LABEL_VCS_URL=
75LABEL maintainer="searx <${GIT_URL}>" \
74LABEL maintainer="searx <${GIT_URL}>" \
76 description="A privacy-respecting, hackable metasearch engine." \
75 description="A privacy-respecting, hackable metasearch engine." \
77 version="${SEARX_GIT_VERSION}" \
76 version="${SEARX_GIT_VERSION}" \