From 8c1f77f4485f23a8d14f39db736b57334f43b4be Mon Sep 17 00:00:00 2001 From: samuel-p Date: Fri, 26 Nov 2021 23:12:23 +0100 Subject: [PATCH] removed base dependency versioning --- Dockerfile | 28 ++-------------------------- renovate.json | 19 ------------------- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/Dockerfile b/Dockerfile index 962d3e7..0efdf94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,32 +8,8 @@ ENV INSTANCE_NAME=searx WORKDIR /usr/local/searx RUN apk upgrade --no-cache \ - && apk add --no-cache -t build-dependencies \ - gcc="10.3.1_git20210424-r2" \ - musl-dev="1.2.2-r3" \ - cargo="1.52.1-r1" \ - build-base="0.5-r2" \ - py3-setuptools="52.0.0-r3" \ - python3-dev="3.9.5-r2" \ - libffi-dev="3.3-r2" \ - libxslt-dev="1.1.34-r1" \ - libxml2-dev="2.9.12-r1" \ - openssl-dev="1.1.1l-r0" \ - tar="1.34-r0" \ - git="2.32.0-r0" \ - curl="7.79.1-r0" \ - && apk add --no-cache \ - ca-certificates="20191127-r5" \ - su-exec="0.2-r1" \ - python3="3.9.5-r2" \ - py3-pip="20.3.4-r1" \ - libxml2="2.9.12-r1" \ - libxslt="1.1.34-r1" \ - openssl="1.1.1l-r0" \ - tini="0.19.0-r0" \ - uwsgi="2.0.19.1-r2" \ - uwsgi-python3="2.0.19.1-r2" \ - brotli="1.0.9-r5" \ + && apk add --no-cache -t build-dependencies gcc musl-dev cargo build-base py3-setuptools python3-dev libffi-dev libxslt-dev libxml2-dev openssl-dev tar git curl \ + && apk add --no-cache ca-certificates su-exec python3 py3-pip libxml2 libxslt openssl tini uwsgi uwsgi-python3 brotli \ && 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 \ diff --git a/renovate.json b/renovate.json index 5ed755a..84a4853 100644 --- a/renovate.json +++ b/renovate.json @@ -20,17 +20,6 @@ "versioningTemplate": "loose", "depNameTemplate": "searx/searx", "datasourceTemplate": "github-releases" - }, - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "\\s+(?[a-z0-9\\-]+?)=\"(?.*?)\"" - ], - "lookupNameTemplate": "alpine_3_14/{{{depName}}}", - "versioningTemplate": "loose", - "datasourceTemplate": "repology" } ], "packageRules": [ @@ -42,14 +31,6 @@ "searx" ] }, - { - "datasources": [ - "repology" - ], - "groupName": [ - "base dependencies" - ] - }, { "datasources": [ "docker"