diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 04a1635..1b49478 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v4.6.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -31,7 +31,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/gitleaks/gitleaks - rev: v8.26.0 + rev: v8.16.4 hooks: - id: gitleaks - repo: local @@ -41,7 +41,7 @@ repos: entry: python build/check-ssh-keys.py language: python files: ^pillars/users/.+\.sls$ - additional_dependencies: ['pyyaml==6.0.2'] # Renovate can't parse it, yet https://github.com/renovatebot/renovate/issues/20780 # TODO + additional_dependencies: ['pyyaml==6.0.1'] # Renovate can't parse it, yet https://github.com/renovatebot/renovate/issues/20780 # TODO - id: prettier # Copied from https://github.com/pre-commit/mirrors-prettier/ instead of referencing it to not rely on their published Prettier versions name: Prettier diff --git a/.woodpecker/.build.yaml b/.woodpecker/.build.yaml index d8ed153..f59d616 100644 --- a/.woodpecker/.build.yaml +++ b/.woodpecker/.build.yaml @@ -3,7 +3,7 @@ steps: when: - event: push branch: main - image: woodpeckerci/plugin-docker-buildx:6.0.1@sha256:d75734dc72e21033eb539a7e983acbfea5b84c260b78c07247b74d3067d66742 + image: woodpeckerci/plugin-docker-buildx:4.0.0@sha256:9d24b71c37d7a958d79252e608c4d1a04b02f2e74d4e26003b43e0830038bde0 pull: true settings: platforms: linux/amd64 @@ -21,7 +21,7 @@ steps: - event: push branch: exclude: ['main'] - image: woodpeckerci/plugin-docker-buildx:6.0.1@sha256:d75734dc72e21033eb539a7e983acbfea5b84c260b78c07247b74d3067d66742 + image: woodpeckerci/plugin-docker-buildx:4.0.0@sha256:9d24b71c37d7a958d79252e608c4d1a04b02f2e74d4e26003b43e0830038bde0 pull: true settings: platforms: linux/amd64 diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml index 083eaf9..b63c742 100644 --- a/.woodpecker/.test.yaml +++ b/.woodpecker/.test.yaml @@ -7,7 +7,7 @@ variables: - &image 'git.verdigado.com/verdigado-images/container-pre-commit:${CI_COMMIT_SHA}' steps: await-image: - image: alpine@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c + image: alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 environment: IMAGE: *image commands: @@ -16,7 +16,7 @@ steps: - echo 'found.' clone salt: - image: woodpeckerci/plugin-git@sha256:d619f364acd546134a9ba06d29a9cb55156eddfc21f60307f1fdcf4e0b2aafa6 + image: woodpeckerci/plugin-git@sha256:7af90de3a9aa5dc93cc0d5cd2e67e28cb237d4b8e891ccacfd9031f78f4b05a8 settings: remote: https://git.verdigado.com/verdigado-Privileged/Salt.git path: salt @@ -36,7 +36,7 @@ steps: - pre-commit run --all-files clone rocketchat2matrix: - image: woodpeckerci/plugin-git@sha256:d619f364acd546134a9ba06d29a9cb55156eddfc21f60307f1fdcf4e0b2aafa6 + image: woodpeckerci/plugin-git@sha256:7af90de3a9aa5dc93cc0d5cd2e67e28cb237d4b8e891ccacfd9031f78f4b05a8 settings: remote: https://git.verdigado.com/NB-Public/rocketchat2matrix.git path: rocketchat2matrix diff --git a/Dockerfile b/Dockerfile index c9c2201..7d56d09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -FROM python:3.13.3-alpine3.20@sha256:40a4559d3d6b2117b1fbe426f17d55b9100fa40609733a1d0c3f39e2151d4b33 +FROM python:3.12.4-alpine3.20@sha256:b7662fc33e07f05fb2f579c3634e1e4d2e30c02553397c6c24f775cb360dbc03 # renovate: datasource=repology depName=alpine_3_20/build-base versioning=loose ENV BUILD_BASE_VERSION="0.5-r3" # renovate: datasource=repology depName=alpine_3_20/gcc versioning=loose -ENV GCC_VERSION="13.2.1_git20240309-r1" +ENV GCC_VERSION="13.2.1_git20240309-r0" # renovate: datasource=repology depName=alpine_3_20/ruby versioning=loose -ENV RUBY_VERSION="3.3.8-r0" +ENV RUBY_VERSION="3.3.3-r0" # renovate: datasource=repology depName=alpine_3_20/git versioning=loose -ENV GIT_VERSION="2.45.3-r0" +ENV GIT_VERSION="2.45.2-r0" # renovate: datasource=repology depName=alpine_3_20/openssh-keygen versioning=loose -ENV OPENSSH_KEYGEN_VERSION="9.7_p1-r5" +ENV OPENSSH_KEYGEN_VERSION="9.7_p1-r4" # renovate: datasource=pypi depName=pre-commit versioning=pep440 -ENV PRE_COMMIT_VERSION="4.2.0" +ENV PRE_COMMIT_VERSION="3.7.1" RUN mkdir /data /tmp/pre-commit COPY .pre-commit-config.yaml /tmp/pre-commit diff --git a/renovate.json b/renovate.json index f0fc161..c31ec0e 100644 --- a/renovate.json +++ b/renovate.json @@ -8,14 +8,15 @@ { "groupName": "all dependencies", "groupSlug": "all", - "matchPackageNames": ["/*/"] + "matchPackagePatterns": ["*"] } ], "separateMajorMinor": false, + "pre-commit": { "enabled": true }, "customManagers": [ { "customType": "regex", - "managerFilePatterns": ["/^Dockerfile$/"], + "fileMatch": ["^Dockerfile$"], "matchStrings": [ "#\\s*renovate:\\s*datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\sENV .*?_VERSION=\"(?.*)\"\\s" ],