From 8d51731d4554de177fde0932c792f00b0ebb4495 Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Fri, 23 Aug 2024 16:29:42 +0200 Subject: [PATCH] Fix versioning schemes The `node` versioning scheme does only use LTS by default, which we want. So we need to apply that for the Docker tags of node.js images. NPM packages should use the appropriate versioning scheme as well. --- .renovaterc | 9 +++++++++ images/node-script/Dockerfile | 14 +++++++------- images/python-script/Dockerfile | 9 --------- images/python-script/requirements.txt | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.renovaterc b/.renovaterc index f3d58ed..ac7910d 100644 --- a/.renovaterc +++ b/.renovaterc @@ -30,6 +30,15 @@ "llvm/llvm-project" ], "extractVersion": "^llvmorg-(?\\d+)\\.\\d+\\.\\d+$" + }, + { + "matchPackageNames": [ + "node" + ], + "matchDatasources": [ + "docker" + ], + "versioning": "node" } ] } diff --git a/images/node-script/Dockerfile b/images/node-script/Dockerfile index b46daa4..38f17b4 100644 --- a/images/node-script/Dockerfile +++ b/images/node-script/Dockerfile @@ -1,18 +1,18 @@ FROM node:20.17.0-slim -# renovate: datasource=npm packageName=npm +# renovate: datasource=npm packageName=npm versioning=npm ARG NPM_VERSION=10.5.0 -# renovate: datasource=npm packageName=bluebird +# renovate: datasource=npm packageName=bluebird versioning=npm ARG BLUEBIRD_VERSION=3.7.2 -# renovate: datasource=npm packageName=lodash +# renovate: datasource=npm packageName=lodash versioning=npm ARG LODASH_VERSION=4.17.21 -# renovate: datasource=npm packageName=moment +# renovate: datasource=npm packageName=moment versioning=npm ARG MOMENT_VERSION=2.30.1 -# renovate: datasource=npm packageName=shelljs +# renovate: datasource=npm packageName=shelljs versioning=npm ARG SHELLJS_VERSION=0.8.5 -# renovate: datasource=npm packageName=js-yaml +# renovate: datasource=npm packageName=js-yaml versioning=npm ARG JS_YAML_VERSION=4.1.0 -# renovate: datasource=npm packageName=got +# renovate: datasource=npm packageName=got versioning=npm ARG GOT_VERSION=14.4.2 # No need for root access for a script runner diff --git a/images/python-script/Dockerfile b/images/python-script/Dockerfile index 0111c67..522236d 100644 --- a/images/python-script/Dockerfile +++ b/images/python-script/Dockerfile @@ -1,14 +1,5 @@ FROM python:3.12.5-slim-bookworm -ARG PIP_VERSION=24.2 -ARG NUMPY_VERSION=2.1.0 -ARG HTTPIE_VERSION=3.2.3 -ARG PYFROGEJO_VERSION=1.0.2 -ARG DOCKER_VERSION=7.1.0 -ARG XQ_VERSION=0.0.4 -ARG SPOTIFY_VERSION=0.10.2 -ARG REQUESTS_VERSION=2.32.2 - RUN set -e; \ apt-get update -q; \ apt-get install -qy --no-install-recommends --no-install-suggests \ diff --git a/images/python-script/requirements.txt b/images/python-script/requirements.txt index 88239ac..bdd3284 100644 --- a/images/python-script/requirements.txt +++ b/images/python-script/requirements.txt @@ -1,8 +1,8 @@ -pip -numpy -httpie -pyforgejo -requests -spotify -xq -docker +pip==24.2 +numpy==2.1.0 +httpie==3.2.1 +pyforgejo==1.0.2 +requests==2.32.1 +spotify==0.10.2 +xq==0.0.4 +docker==7.0.1