2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

updated renovate config and added annotations for renovate

Browse source
This commit is contained in:
Jenny Danzmayr 2023-11-12 04:59:32 +01:00
parent f6249d0b3b
commit acf940ca7c
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docker/Dockerfile
View file

@ -5,14 +5,21 @@ ENV DEBIAN_FRONTEND noninteractive
RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
python3.11=3.11.2-6ubuntu0.1 \ python3.11=3.11.2-6ubuntu0.1 \
# renovate: srcname=python3.11
libpython3.11=3.11.2-6ubuntu0.1 \ libpython3.11=3.11.2-6ubuntu0.1 \
# renovate: srcname=python3.11
python3.11-venv=3.11.2-6ubuntu0.1 \ python3.11-venv=3.11.2-6ubuntu0.1 \
# renovate: srcname=python-pip
python3-pip=23.0.1+dfsg-1 \ python3-pip=23.0.1+dfsg-1 \
# renovate: srcname=postgresql-15
libpq5=15.3-0ubuntu0.23.04.1 \ libpq5=15.3-0ubuntu0.23.04.1 \
# renovate: srcname=postgresql-15
postgresql-client-15=15.3-0ubuntu0.23.04.1 \ postgresql-client-15=15.3-0ubuntu0.23.04.1 \
curl=7.88.1-8ubuntu2 \ curl=7.88.1-8ubuntu2 \
libpcre3=2:8.39-15 \ libpcre3=2:8.39-15 \
# renovate: srcname=librsvg
librsvg2-2=2.54.5+dfsg-1ubuntu2 \ librsvg2-2=2.54.5+dfsg-1ubuntu2 \
# renovate: srcname=librsvg
gir1.2-rsvg-2.0=2.54.5+dfsg-1ubuntu2 \ gir1.2-rsvg-2.0=2.54.5+dfsg-1ubuntu2 \
libgirepository-1.0-1=1.76.1-1 \ libgirepository-1.0-1=1.76.1-1 \
tzdata=2023c-2exp1ubuntu1.1 \ tzdata=2023c-2exp1ubuntu1.1 \
@ -24,8 +31,10 @@ FROM base as builder
RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
build-essential=12.9ubuntu3 \ build-essential=12.9ubuntu3 \
# renovate: srcname=python3.11
python3.11-dev=3.11.2-6ubuntu0.1 \ python3.11-dev=3.11.2-6ubuntu0.1 \
libpcre3-dev=2:8.39-15 \ libpcre3-dev=2:8.39-15 \
# renovate: srcname=postgresql-15
libpq-dev=15.3-0ubuntu0.23.04.1 \ libpq-dev=15.3-0ubuntu0.23.04.1 \
libgirepository1.0-dev=1.76.1-1 libgirepository1.0-dev=1.76.1-1

4
docker/tileserver.dockerfile
View file

@ -5,8 +5,11 @@ ENV DEBIAN_FRONTEND noninteractive
RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
python3.11=3.11.2-6ubuntu0.1 \ python3.11=3.11.2-6ubuntu0.1 \
# renovate: srcname=python3.11
libpython3.11=3.11.2-6ubuntu0.1 \ libpython3.11=3.11.2-6ubuntu0.1 \
# renovate: srcname=python3.11
python3.11-venv=3.11.2-6ubuntu0.1 \ python3.11-venv=3.11.2-6ubuntu0.1 \
# renovate: srcname=python-pip
python3-pip=23.0.1+dfsg-1 \ python3-pip=23.0.1+dfsg-1 \
curl=7.88.1-8ubuntu2 \ curl=7.88.1-8ubuntu2 \
libpcre3=2:8.39-15 \ libpcre3=2:8.39-15 \
@ -18,6 +21,7 @@ FROM base as builder
RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \
apt-get update && apt-get install -y --no-install-recommends \ apt-get update && apt-get install -y --no-install-recommends \
build-essential=12.9ubuntu3 \ build-essential=12.9ubuntu3 \
# renovate: srcname=python3.11
python3.11-dev=3.11.2-6ubuntu0.1 \ python3.11-dev=3.11.2-6ubuntu0.1 \
libpcre3-dev=2:8.39-15 libpcre3-dev=2:8.39-15

15
renovate.json
View file

@ -29,7 +29,7 @@
}, },
"regexManagers": [ "regexManagers": [
{ {
"fileMatch": ["(^|/)[\\w-]*[Dd]ockerfile$"], "fileMatch": ["(^|/)[\\w-.]*[Dd]ockerfile$"],
"matchStringsStrategy": "any", "matchStringsStrategy": "any",
"matchStrings": [ "matchStrings": [
"ARG BUILD_FROM=(?<depName>.*?):(?<currentValue>.*?)\\s+" "ARG BUILD_FROM=(?<depName>.*?):(?<currentValue>.*?)\\s+"
@ -37,17 +37,22 @@
"datasourceTemplate": "docker" "datasourceTemplate": "docker"
}, },
{ {
"fileMatch": ["(^|/)[\\w-]*[Dd]ockerfile$"], "fileMatch": ["(^|/)[\\w-.]*[Dd]ockerfile$"],
"matchStringsStrategy": "any", "matchStringsStrategy": "any",
"matchStrings": [ "matchStrings": [
"\\s+(?<package>[a-z0-9][a-z0-9-]+)=(?<currentValue>[a-z0-9-:_+~.]+)\\s+" "(#\\s*renovate:\\s*srcname=(?<srcname>.*?)( datasource=(?<datasource>.*?))?( versioning=(?<versioning>.*?))?)?\\s+(?<package>[a-z0-9][a-z0-9-.]+)=(?<currentValue>[a-z0-9-:_+~.]+)\\s+"
], ],
"versioningTemplate": "deb",
"datasourceTemplate": "repology", "datasourceTemplate": "repology",
"depNameTemplate": "ubuntu_23_04/{{{package}}}" "depNameTemplate": "{{#if datasource}}{{{datasource}}}{{else}}ubuntu_23_04{{/if}}/{{#if srcname}}{{{srcname}}}{{else}}{{{package}}}{{/if}}",
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}deb{{/if}}"
} }
], ],
"packageRules": [ "packageRules": [
{
"matchPackagePatterns": ["ubuntu_\\d\\d_\\d\\d/build-essential"],
"matchManagers": ["regex"],
"enabled": false
},
{ {
"groupName": "docker core image", "groupName": "docker core image",
"matchPaths": [ "matchPaths": [