From 64c3f1fa9c79dd21689cb9b0bbe47e8e78ee05af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20H=C3=BCttemann?= <henrik.huettemann@verdigado.com>
Date: Thu, 20 Jun 2024 16:39:03 +0200
Subject: [PATCH 1/2] Add tests for pre-commit container

Run pre-commit on the freshly built container against salt and rc2matrix
---
 .woodpecker.yaml => .woodpecker/.build.yaml | 23 +++++----
 .woodpecker/.test.yaml                      | 56 +++++++++++++++++++++
 2 files changed, 69 insertions(+), 10 deletions(-)
 rename .woodpecker.yaml => .woodpecker/.build.yaml (72%)
 create mode 100644 .woodpecker/.test.yaml

diff --git a/.woodpecker.yaml b/.woodpecker/.build.yaml
similarity index 72%
rename from .woodpecker.yaml
rename to .woodpecker/.build.yaml
index 463d1a5..f59d616 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker/.build.yaml
@@ -1,10 +1,8 @@
-when:
-  path: '*Dockerfile*'
-
 steps:
-  build-main:
+  build main:
     when:
-      branch: main
+      - event: push
+        branch: main
     image: woodpeckerci/plugin-docker-buildx:4.0.0@sha256:9d24b71c37d7a958d79252e608c4d1a04b02f2e74d4e26003b43e0830038bde0
     pull: true
     settings:
@@ -14,12 +12,15 @@ steps:
       password:
         from_secret: gitea_token
       repo: git.verdigado.com/${CI_REPO,,}
-      tag: 'latest'
+      tags:
+        - 'latest'
+        - ${CI_COMMIT_SHA}
 
-  build-branch:
+  build branch:
     when:
-      branch:
-        exclude: ['main']
+      - event: push
+        branch:
+          exclude: ['main']
     image: woodpeckerci/plugin-docker-buildx:4.0.0@sha256:9d24b71c37d7a958d79252e608c4d1a04b02f2e74d4e26003b43e0830038bde0
     pull: true
     settings:
@@ -29,4 +30,6 @@ steps:
       password:
         from_secret: gitea_token
       repo: git.verdigado.com/${CI_REPO,,}
-      tag: ${CI_COMMIT_BRANCH}
+      tags:
+        - ${CI_COMMIT_BRANCH}
+        - ${CI_COMMIT_SHA}
diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml
new file mode 100644
index 0000000..69c9a51
--- /dev/null
+++ b/.woodpecker/.test.yaml
@@ -0,0 +1,56 @@
+skip_clone: true
+when:
+  - event: push
+depends_on:
+  - build
+variables:
+  - &image 'git.verdigado.com/verdigado-images/container-pre-commit:${CI_COMMIT_SHA}'
+steps:
+  await-image:
+    image: alpine
+    environment:
+      IMAGE: *image
+    commands:
+      - apk add --update --no-cache img
+      - 'while !(( img pull $IMAGE 2>&1 | grep -q "Error: failed to unmount" )) ; do echo "Awaiting image $IMAGE..."; sleep 3; done'
+      - echo 'found.'
+
+  clone salt:
+    image: woodpeckerci/plugin-git
+    settings:
+      remote: https://git.verdigado.com/verdigado-Privileged/Salt.git
+      path: salt
+      sha: ''
+      ref: refs/heads/master
+      branch: master
+
+  pre-commit salt:
+    image: *image
+    depends_on:
+      - await-image
+      - clone salt
+    environment:
+      - SKIP=no-commit-to-branch # Ignore "don't commit to protected branch" check
+    commands:
+      - cd salt
+      - pre-commit run --all-files
+
+  clone rocketchat2matrix:
+    image: woodpeckerci/plugin-git
+    settings:
+      remote: https://git.verdigado.com/NB-Public/rocketchat2matrix.git
+      path: rocketchat2matrix
+      sha: ''
+      ref: refs/heads/main
+      branch: master
+
+  pre-commit rocketchat2matrix:
+    image: *image
+    depends_on:
+      - await-image
+      - clone rocketchat2matrix
+    environment:
+      - SKIP=no-commit-to-branch # Ignore "don't commit to protected branch" check
+    commands:
+      - cd rocketchat2matrix
+      - pre-commit run --all-files

From e43b05e0fdd30f4cb56b9f74e25fd18d1ba6a6d8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <technik+removate@verdigado.net>
Date: Tue, 25 Jun 2024 07:02:53 +0000
Subject: [PATCH 2/2] Renovate: Pin dependencies

---
 .woodpecker/.test.yaml | 6 +++---
 Dockerfile             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.test.yaml b/.woodpecker/.test.yaml
index 69c9a51..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
+    image: alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
     environment:
       IMAGE: *image
     commands:
@@ -16,7 +16,7 @@ steps:
       - echo 'found.'
 
   clone salt:
-    image: woodpeckerci/plugin-git
+    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
+    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 9991bd2..e988a6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM python:3.12.4-alpine3.20@sha256:a982997504b8ec596f553d78f4de4b961bbdf5254e0177f6e99bb34f4ef16f95
+FROM python:3.12.4-alpine3.20@sha256:dc095966439c68283a01dde5e5bc9819ba24b28037dddd64ea224bf7aafc0c82
 
 # 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-r0"
 # renovate: datasource=repology depName=alpine_3_20/ruby versioning=loose
-ENV RUBY_VERSION="3.3.1-r0"
+ENV RUBY_VERSION="3.3.3-r0"
 # renovate: datasource=repology depName=alpine_3_20/git versioning=loose
 ENV GIT_VERSION="2.45.2-r0"
 # renovate: datasource=repology depName=alpine_3_20/openssh-keygen versioning=loose