major refactorings and improvements

.drone.yml

@@ -15,7 +15,6 @@ steps:
       auto_tag: true
       auto_tag_suffix: linux-amd64
       repo: spcodes/searx
-      dockerfile: searx/Dockerfile
       build_args:
         - ARCH=amd64
       username:
@@ -47,7 +46,6 @@ steps:
       auto_tag: true
       auto_tag_suffix: linux-arm
       repo: spcodes/searx
-      dockerfile: searx/Dockerfile
       build_args:
         - ARCH=arm
       username:
@@ -79,7 +77,6 @@ steps:
       auto_tag: true
       auto_tag_suffix: linux-arm64
       repo: spcodes/searx
-      dockerfile: searx/Dockerfile
       build_args:
         - ARCH=arm64
       username:

Dockerfile

@@ -4,9 +4,6 @@ FROM arm32v7/alpine:3.12.3@sha256:299294be8699c1b323c137f972fd0aa5eaa4b95489c213
 FROM arm64v8/alpine:3.12.3@sha256:549694ea68340c26d1d85c00039aa11ad835be279bfd475ff4284b705f92c24e AS base-arm64
 FROM base-${ARCH}
 
-# github: searx/searx
-ENV SEARX="v0.18.0"
-
 ENTRYPOINT ["/sbin/tini","--","/usr/local/searx/dockerfiles/docker-entrypoint.sh"]
 EXPOSE 8080
 VOLUME /etc/searx
@@ -14,56 +11,36 @@ VOLUME /var/log/uwsgi
 
 RUN addgroup searx && adduser -D -h /usr/local/searx -s /bin/sh -G searx searx
 
+ENV SEARX_VERSION="v0.18.0"
 ENV INSTANCE_NAME=searx
 
 WORKDIR /usr/local/searx
 
 RUN apk upgrade --no-cache \
  && apk add --no-cache -t build-dependencies \
-    # repology: alpine_3_12/build-base
     build-base="0.5-r2" \
-    # repology: alpine_3_12/py3-setuptools
     py3-setuptools="47.0.0-r0" \
-    # repology: alpine_3_12/python3-dev
     python3-dev="3.8.5-r0" \
-    # repology: alpine_3_12/libffi-dev
     libffi-dev="3.3-r2" \
-    # repology: alpine_3_12/libxslt-dev
     libxslt-dev="1.1.34-r0" \
-    # repology: alpine_3_12/libxml2-dev
     libxml2-dev="2.9.10-r5" \
-    # repology: alpine_3_12/openssl-dev
     openssl-dev="1.1.1i-r0" \
-    # repology: alpine_3_12/tar
     tar="1.32-r1" \
-    # repology: alpine_3_12/git
     git="2.26.2-r0" \
-    # repology: alpine_3_12/curl
     curl="7.69.1-r3" \
  && apk add --no-cache \
-    # repology: alpine_3_12/ca-certificates
     ca-certificates="20191127-r4" \
-    # repology: alpine_3_12/su-exec
     su-exec="0.2-r1" \
-    # repology: alpine_3_12/python3
     python3="3.8.5-r0" \
-    # repology: alpine_3_12/py3-pip
     py3-pip="20.1.1-r0" \
-    # repology: alpine_3_12/libxml2
     libxml2="2.9.10-r5" \
-    # repology: alpine_3_12/libxslt
     libxslt="1.1.34-r0" \
-    # repology: alpine_3_12/openssl
     openssl="1.1.1i-r0" \
-    # repology: alpine_3_12/tini
     tini="0.19.0-r0" \
-    # repology: alpine_3_12/uwsgi
     uwsgi="2.0.18-r8" \
-    # repology: alpine_3_12/uwsgi-python3
     uwsgi-python3="2.0.18-r8" \
-    # repology: alpine_3_12/brotli
     brotli="1.0.9-r1" \
- && curl -L "https://github.com/searx/searx/archive/${SEARX}.tar.gz" | tar xvz --strip 1 && chown -R searx:searx * \
+ && curl -L "https://github.com/searx/searx/archive/${SEARX_VERSION}.tar.gz" | tar xvz --strip 1 && chown -R searx:searx * \
  && pip3 install --upgrade pip \
  && pip3 install --no-cache -r requirements.txt \
  && apk del build-dependencies \

README.md

@@ -1,3 +1,15 @@
-# searx
+# [searx](https://git.sp-codes.de/sp-services/searx)
 
-All Docker Images for [searx.sp-codes.de](https://searx.sp-codes.de).
+[![Build Status](https://ci.sp-codes.de/api/badges/sp-services/searx/status.svg)](https://ci.sp-codes.de/sp-services/searx) [![License](https://img.shields.io/badge/license-AGPL--3.0-purple)](#license) [![Docker Pulls](https://img.shields.io/docker/pulls/spcodes/searx)](https://hub.docker.com/r/spcodes/searx)
+
+The Docker Image for [searx.sp-codes.de](https://searx.sp-codes.de)
+
+## Usage
+
+For a detailed usage guide see https://searx.github.io/searx/admin/installation-docker.html
+
+## License
+
+[![GNU AGPLv3 Image](https://www.gnu.org/graphics/agplv3-155x51.png)](https://www.gnu.org/licenses/agpl-3.0)
+
+This project is Free Software: It is licensed under GNU AGPL v3 (See [LICENSE](LICENSE) for more information).

renovate.json

@@ -10,23 +10,23 @@
   "regexManagers": [
     {
       "fileMatch": [
-        "(^|/|\\.)Dockerfile$",
-        "(^|/)Dockerfile\\.[^/]*$"
+        "^Dockerfile$"
       ],
       "matchStrings": [
-        "#\\s*github:\\s*(?<depName>.*?)\\s*.*?=\"(?<currentValue>.*?)\"\\s*"
+        "\\s*ENV\\s*SEARX_VERSION=\"(?<currentValue>.*?)\"\\s*"
       ],
       "versioningTemplate": "loose",
+      "depNameTemplate": "searx/searx",
       "datasourceTemplate": "github-releases"
     },
     {
       "fileMatch": [
-        "(^|/|\\.)Dockerfile$",
-        "(^|/)Dockerfile\\.[^/]*$"
+        "^Dockerfile$"
       ],
       "matchStrings": [
-        "#\\s*repology:\\s*(?<depName>.*?)\\s*.*?=\"(?<currentValue>.*?)\"\\s*"
+        "\\s*(?<depName>[a-z0-9\\-]+?)=\"(?<currentValue>.*?)\"\\s*"
       ],
+      "lookupNameTemplate": "alpine_3_12/{{{depName}}}",
       "versioningTemplate": "loose",
       "datasourceTemplate": "repology"
     }