on master help sign in
Merge pull request #2725 from 3nprob/optimize-docker-build

Reduce redundant docker build steps

commit647c3fb4a57a8b6a979bebea8375525d00301e03 authorNoémi Ványi <kvch@users.noreply.github.com> dateMon 5 Apr 2021, 18:55 (6 years ago) parent70895263c6c827
1 file changed+9−10
Dockerfile+9−10
Dockerfile+9−10
@@ -4,21 +4,12 @@ EXPOSE 8080
44VOLUME /etc/searx
55VOLUME /var/log/uwsgi
66
7−ARG GIT_URL=unknown
8−ARG VERSION_GITCOMMIT=unknown
9−ARG SEARX_GIT_VERSION=unknown
10−
117ARG SEARX_GID=977
128ARG SEARX_UID=977
139
1410RUN addgroup -g ${SEARX_GID} searx && \
1511 adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
1612
17−ARG TIMESTAMP_SETTINGS=0
18−ARG TIMESTAMP_UWSGI=0
19−ARG LABEL_VCS_REF=
20−ARG LABEL_VCS_URL=
21−
2213ENV INSTANCE_NAME=searx \
2314 AUTOCOMPLETE= \
2415 BASE_URL= \
@@ -60,6 +51,10 @@ RUN apk upgrade --no-cache \
6051
6152COPY --chown=searx:searx . .
6253
54+ARG TIMESTAMP_SETTINGS=0
55+ARG TIMESTAMP_UWSGI=0
56+ARG VERSION_GITCOMMIT=unknown
57+
6358RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
6459 touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml; \
6560 touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini; \
@@ -70,8 +65,12 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
7065 -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \
7166 -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+
7267
73−# Keep this argument at the end since it change each time
68+# Keep these arguments at the end to prevent redundant layer rebuilds
7469ARG LABEL_DATE=
70+ARG GIT_URL=unknown
71+ARG SEARX_GIT_VERSION=unknown
72+ARG LABEL_VCS_REF=
73+ARG LABEL_VCS_URL=
7574LABEL maintainer="searx <${GIT_URL}>" \
7675 description="A privacy-respecting, hackable metasearch engine." \
7776 version="${SEARX_GIT_VERSION}" \