Browse Source

Merge pull request #1680 from robbyoconnor/patch-1

Add --no-cache to tell apk to not cache packages
Adam Tauber 5 years ago
parent
commit
1bb46e5e37
1 changed files with 15 additions and 15 deletions
  1. 15 15
      Dockerfile

+ 15 - 15
Dockerfile

@@ -1,10 +1,17 @@
 FROM alpine:3.10
 FROM alpine:3.10
+ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
+EXPOSE 8080
+VOLUME /etc/searx
+VOLUME /var/log/uwsgi
 
 
-ARG VERSION_GITCOMMIT=unknow
-ARG SEARX_GIT_VERSION=unknow
+ARG VERSION_GITCOMMIT=unknown
+ARG SEARX_GIT_VERSION=unknown
 
 
-ARG SEARX_GID=1000
-ARG SEARX_UID=1000
+ARG SEARX_GID=977
+ARG SEARX_UID=977
+
+RUN addgroup -g ${SEARX_GID} searx && \
+    adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
 
 
 ARG TIMESTAMP_SETTINGS=0
 ARG TIMESTAMP_SETTINGS=0
 ARG TIMESTAMP_UWSGI=0
 ARG TIMESTAMP_UWSGI=0
@@ -16,19 +23,14 @@ ENV INSTANCE_NAME=searx \
     BASE_URL= \
     BASE_URL= \
     MORTY_KEY= \
     MORTY_KEY= \
     MORTY_URL=
     MORTY_URL=
-EXPOSE 8080
-VOLUME /etc/searx
-VOLUME /var/log/uwsgi
 
 
 WORKDIR /usr/local/searx
 WORKDIR /usr/local/searx
 
 
-RUN addgroup -g ${SEARX_GID} searx && \
-    adduser -u ${SEARX_UID} -D -h /usr/local/searx -s /bin/sh -G searx searx
 
 
 COPY requirements.txt ./requirements.txt
 COPY requirements.txt ./requirements.txt
 
 
-RUN apk -U upgrade \
- && apk add -t build-dependencies \
+RUN apk upgrade --no-cache \
+ && apk add --no-cache -t build-dependencies \
     build-base \
     build-base \
     py3-setuptools \
     py3-setuptools \
     python3-dev \
     python3-dev \
@@ -38,7 +40,7 @@ RUN apk -U upgrade \
     openssl-dev \
     openssl-dev \
     tar \
     tar \
     git \
     git \
- && apk add \
+ && apk add --no-cache \
     ca-certificates \
     ca-certificates \
     su-exec \
     su-exec \
     python3 \
     python3 \
@@ -50,8 +52,7 @@ RUN apk -U upgrade \
     uwsgi-python3 \
     uwsgi-python3 \
  && pip3 install --upgrade pip \
  && pip3 install --upgrade pip \
  && pip3 install --no-cache -r requirements.txt \
  && pip3 install --no-cache -r requirements.txt \
- && apk del build-dependencies \
- && rm -f /var/cache/apk/*
+ && apk del build-dependencies
 
 
 COPY --chown=searx:searx . .
 COPY --chown=searx:searx . .
 
 
@@ -62,7 +63,6 @@ RUN su searx -c "/usr/bin/python3 -m compileall -q searx"; \
       echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
       echo "VERSION_STRING = VERSION_STRING + \"-$VERSION_GITCOMMIT\"" >> /usr/local/searx/searx/version.py; \
     fi
     fi
 
 
-ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
 
 
 # Keep this argument at the end since it change each time
 # Keep this argument at the end since it change each time
 ARG LABEL_DATE=
 ARG LABEL_DATE=