upgrade python to version 3 in searx image and fix build error

This commit is contained in:
hoellen 2019-02-01 09:25:01 +01:00
parent 634bafb496
commit 7e0b8588c4
2 changed files with 6 additions and 6 deletions

View File

@ -8,7 +8,7 @@ ENV BASE_URL=False IMAGE_PROXY=False \
RUN apk -U upgrade \
&& apk add -t build-dependencies \
build-base \
python-dev \
python3-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
@ -17,16 +17,16 @@ RUN apk -U upgrade \
ca-certificates \
&& apk add \
su-exec \
python \
python3 \
libxml2 \
libxslt \
openssl \
tini \
py2-pip \
&& mkdir /usr/local/searx && cd /usr/local/searx \
&& wget -qO- https://github.com/asciimoo/searx/archive/v${VERSION}.tar.gz | tar xz --strip 1 \
&& pip install --upgrade pip \
&& pip install --no-cache -r requirements.txt \
&& pip3 install --upgrade pip \
&& pip3 install --upgrade setuptools pip==18.1 #pip=18.1 because of pypa/pip#6197 \
&& pip3 install --no-cache -r requirements.txt \
&& sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
&& apk del build-dependencies \
&& rm -f /var/cache/apk/*

View File

@ -4,4 +4,4 @@ sed -i -e "s|base_url : False|base_url : ${BASE_URL}|g" \
-e "s/ultrasecretkey/$(openssl rand -hex 16)/g" \
/usr/local/searx/searx/settings.yml
exec su-exec $UID:$GID /sbin/tini -- python /usr/local/searx/searx/webapp.py
exec su-exec $UID:$GID /sbin/tini -- python3 /usr/local/searx/searx/webapp.py