fix(ci): define container-runtime

Merge pull request 'chore(deps): update dependency quay.io/skopeo/stable to v1.12.0' (#18 ) from renovate/quay.io-skopeo-stable-1.x into master
Reviewed-on: #18
2023-05-21 13:07:15 +02:00 · 2023-05-21 10:47:09 +00:00 · 2023-05-18 13:58:38 +02:00 · 2023-04-13 22:52:33 +02:00 · 2023-04-13 22:47:38 +02:00 · 2023-04-13 22:46:57 +02:00
6 changed files with 288 additions and 101 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -11,12 +11,12 @@ platform:

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: markdown lint
  commands:
  - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.42.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.33.0
  resources:
    limits:
      cpu: 150
@ -34,7 +34,7 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
      cpu: 150
@ -57,28 +57,22 @@ name: dry-run-amd64
 clone:
  disable: true

-depends_on:
- linter
-
 platform:
  os: linux
  arch: amd64

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: docker.io/plugins/docker:20.10.9
  settings:
    auto_tag: false
-    dockerfile: Dockerfile
    dry_run: true
    force_tag: true
    no_cache: true
    purge: true
-    mirror:
-      from_secret: docker_io_mirror
    registry: git.cryptic.systems
    repo: git.cryptic.systems/volker.raschek/markdownlint
    tags: latest-amd64
@ -99,12 +93,78 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

+depends_on:
+- linter
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm-v7
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: clone
+  image: docker.io/drone/git:1.2.1
+
+- name: build
+  image: docker.io/plugins/docker:20.10.9
+  settings:
+    auto_tag: false
+    dry_run: true
+    force_tag: true
+    no_cache: true
+    purge: true
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/markdownlint
+    tags: latest-arm-v7
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: docker.io/volkerraschek/drone-email:0.1.1
+  when:
+    status:
+    - changed
+    - failure
+
+depends_on:
+- linter
+
 trigger:
  branch:
    exclude:
@ -123,31 +183,25 @@ name: dry-run-arm64-v8
 clone:
  disable: true

-depends_on:
- linter
-
 platform:
  os: linux
  arch: arm64

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: docker.io/plugins/docker:20.10.9
  settings:
    auto_tag: false
-    dockerfile: Dockerfile
    dry_run: true
    force_tag: true
    no_cache: true
    purge: true
-    mirror:
-      from_secret: docker_io_mirror
    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/markdownlint
    tags: latest-arm64-v8
+    repo: git.cryptic.systems/volker.raschek/markdownlint
    username:
      from_secret: git_cryptic_systems_container_registry_user
    password:
@ -165,12 +219,15 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

+depends_on:
+- linter
+
 trigger:
  branch:
    exclude:
@ -189,27 +246,21 @@ name: latest-amd64
 clone:
  disable: true

-depends_on:
- linter
-
 platform:
  os: linux
  arch: amd64

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: docker.io/plugins/docker:20.10.9
  settings:
    auto_tag: false
-    dockerfile: Dockerfile
    force_tag: true
    no_cache: true
    purge: true
-    mirror:
-      from_secret: docker_io_mirror
    registry: git.cryptic.systems
    repo: git.cryptic.systems/volker.raschek/markdownlint
    tags: latest-amd64
@ -230,12 +281,76 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

+depends_on:
+- linter
+
+trigger:
+  branch:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
+
+---
+kind: pipeline
+type: docker
+name: latest-arm-v7
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: clone
+  image: docker.io/drone/git:1.2.1
+
+- name: build
+  image: docker.io/plugins/docker:20.10.9
+  settings:
+    auto_tag: false
+    force_tag: true
+    no_cache: true
+    purge: true
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/markdownlint
+    tags: latest-arm-v7
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: docker.io/volkerraschek/drone-email:0.1.1
+  when:
+    status:
+    - changed
+    - failure
+
+depends_on:
+- linter
+
 trigger:
  branch:
  - master
@ -253,30 +368,24 @@ name: latest-arm64-v8
 clone:
  disable: true

-depends_on:
- linter
-
 platform:
  os: linux
  arch: arm64

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: docker.io/plugins/docker:20.10.9
  settings:
    auto_tag: false
-    dockerfile: Dockerfile
    force_tag: true
    no_cache: true
    purge: true
-    mirror:
-      from_secret: docker_io_mirror
    registry: git.cryptic.systems
-    repo: git.cryptic.systems/volker.raschek/markdownlint
    tags: latest-arm64-v8
+    repo: git.cryptic.systems/volker.raschek/markdownlint
    username:
      from_secret: git_cryptic_systems_container_registry_user
    password:
@ -294,12 +403,15 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
    - failure

+depends_on:
+- linter
+
 trigger:
  branch:
  - master
@ -317,21 +429,12 @@ name: latest-manifest
 clone:
  disable: true

-depends_on:
- latest-amd64
- latest-arm64-v8
-
-# docker.io/plugins/manifest only for amd64 architectures available
-node_selector:
-  kubernetes.io/os: linux
-  kubernetes.io/arch: amd64
-
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
+  image: docker.io/plugins/manifest:latest
  settings:
    auto_tag: false
    ignore_missing: true
@ -353,7 +456,7 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
      cpu: 150
@ -363,6 +466,11 @@ steps:
    - changed
    - failure

+depends_on:
+- latest-amd64
+- latest-arm-v7
+- latest-arm64-v8
+
 trigger:
  branch:
  - master
@ -385,9 +493,9 @@ depends_on:

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

- name: latest-sync
+- name: latest-docker-sync
  commands:
  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/markdownlint docker.io/volkerraschek
  environment:
@ -399,7 +507,7 @@ steps:
      from_secret: container_image_registry_user
    DEST_CRED_PASSWORD:
      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.17.0
+  image: quay.io/skopeo/stable:v1.12.0

 - name: email-notification
  environment:
@ -413,7 +521,7 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
      cpu: 150
@ -446,19 +554,16 @@ platform:

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: docker.io/plugins/docker:20.10.9
  settings:
    auto_tag: true
    auto_tag_suffix: amd64
-    dockerfile: Dockerfile
    force_tag: true
    no_cache: true
    purge: true
-    mirror:
-      from_secret: docker_io_mirror
    registry: git.cryptic.systems
    repo: git.cryptic.systems/volker.raschek/markdownlint
    username:
@ -480,7 +585,64 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
+  when:
+    status:
+    - changed
+    - failure
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/markdownlint-docker
+
+---
+kind: pipeline
+type: docker
+name: tagged-arm-v7
+
+clone:
+  disable: true
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: clone
+  image: docker.io/drone/git:1.2.1
+
+- name: build
+  image: docker.io/plugins/docker:20.10.9
+  settings:
+    auto_tag: true
+    auto_tag_suffix: arm-v7
+    force_tag: true
+    no_cache: true
+    purge: true
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/markdownlint
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
+    build_args:
+    - MARKDOWNLINT_VERSION=${DRONE_TAG}
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
@ -506,19 +668,16 @@ platform:

 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build
-  image: docker.io/plugins/docker:20.18.4
+  image: docker.io/plugins/docker:20.10.9
  settings:
    auto_tag: true
    auto_tag_suffix: arm64-v8
-    dockerfile: Dockerfile
    force_tag: true
    no_cache: true
    purge: true
-    mirror:
-      from_secret: docker_io_mirror
    registry: git.cryptic.systems
    repo: git.cryptic.systems/volker.raschek/markdownlint
    username:
@ -540,7 +699,7 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  when:
    status:
    - changed
@ -560,21 +719,12 @@ name: tagged-manifest
 clone:
  disable: true

-depends_on:
- tagged-amd64
- tagged-arm64-v8
-
-# docker.io/plugins/manifest only for amd64 architectures available
-node_selector:
-  kubernetes.io/os: linux
-  kubernetes.io/arch: amd64
-
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

 - name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
+  image: docker.io/plugins/manifest:latest
  settings:
    auto_tag: true
    ignore_missing: true
@ -596,7 +746,7 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
      cpu: 150
@ -606,6 +756,11 @@ steps:
    - changed
    - failure

+depends_on:
+- tagged-amd64
+- tagged-arm-v7
+- tagged-arm64-v8
+
 trigger:
  event:
  - tag
@ -620,14 +775,11 @@ name: tagged-sync
 clone:
  disable: true

-depends_on:
- tagged-manifest
-
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.1
+  image: docker.io/drone/git:1.2.1

- name: tagged-sync
+- name: tagged-docker-sync
  commands:
  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/markdownlint docker.io/volkerraschek
  environment:
@ -639,7 +791,7 @@ steps:
      from_secret: container_image_registry_user
    DEST_CRED_PASSWORD:
      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.17.0
+  image: quay.io/skopeo/stable:v1.12.0

 - name: email-notification
  environment:
@ -653,7 +805,7 @@ steps:
      from_secret: smtp_username
    SMTP_PASSWORD:
      from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  image: docker.io/volkerraschek/drone-email:0.1.1
  resources:
    limits:
      cpu: 150
@ -663,6 +815,9 @@ steps:
    - changed
    - failure

+depends_on:
+- tagged-manifest
+
 trigger:
  event:
  - tag
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -0,0 +1,32 @@
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-x86_64:
+    runs-on: x86_64
+    steps:
+    - name: checkout repo
+      uses: actions/checkout@v3
+    # - name: Install docker
+    #   run: |
+    #     apt-get update
+    #     apt-get upgrade --yes
+    #     apt-get install --yes ca-certificates curl gnupg
+    #     install -m 0755 -d /etc/apt/keyrings
+    #     curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+    #     chmod a+r /etc/apt/keyrings/docker.gpg
+    #     echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+    #     apt-get update --yes
+    #     apt-get install --yes docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+
+    - name: build application
+      env:
+        CONTAINER_RUNTIME: podman
+      shell: bash
+      run: make container-image/build
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM docker.io/library/node:22.11.0-alpine3.20 AS build
+FROM docker.io/library/node:lts-alpine3.16 AS build

 ARG MARKDOWNLINT_VERSION=master

--- a/6
+++ b/6
@ -1,6 +1,6 @@
 # MARKDOWNLINT_VERSION
 # Only required to install a specifiy version
-MARKDOWNLINT_VERSION?=v0.42.0 # renovate: datasource=github-releases depName=igorshubovych/markdownlint-cli
+MARKDOWNLINT_VERSION?=v0.33.0 # renovate: datasource=github-releases depName=igorshubovych/markdownlint-cli

 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a
@ -9,8 +9,8 @@ CONTAINER_RUNTIME?=$(shell which podman)

 # MARKDOWNLINT_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.
-MARKDOWNLINT_IMAGE_REGISTRY_NAME:=git.cryptic.systems
-MARKDOWNLINT_IMAGE_REGISTRY_USER:=volker.raschek
+MARKDOWNLINT_IMAGE_REGISTRY_NAME:=docker.io
+MARKDOWNLINT_IMAGE_REGISTRY_USER:=volkerraschek

 MARKDOWNLINT_IMAGE_NAMESPACE?=${MARKDOWNLINT_IMAGE_REGISTRY_USER}
 MARKDOWNLINT_IMAGE_NAME:=markdownlint
--- a/manifest.tmpl
+++ b/manifest.tmpl
@ -11,6 +11,11 @@ manifests:
    platform:
      architecture: amd64
      os: linux
+  - image: git.cryptic.systems/volker.raschek/markdownlint:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7
  - image: git.cryptic.systems/volker.raschek/markdownlint:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
    platform:
      architecture: arm64
--- a/renovate.json
+++ b/renovate.json
@ -1,6 +1,8 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "assignees": [ "volker.raschek" ],
+  "automergeStrategy": "merge-commit",
+  "automergeType": "pr",
  "labels": [ "renovate" ],
  "packageRules": [
    {
@ -9,13 +11,6 @@
      "matchManagers": "droneci",
      "matchUpdateTypes": [ "minor", "patch"]
    },
-    {
-      "description": "Automatically update patch version of used container images in docker files",
-      "addLabels": [ "renovate/container-image", "renovate/automerge" ],
-      "automerge": true,
-      "matchManagers": [ "dockerfile" ],
-      "matchUpdateTypes": [ "minor", "patch" ]
-    },
    {
      "addLabels": [ "renovate/markdownlint-cli", "renovate/automerge" ],
      "automerge": false,
Author	SHA1	Message	Date
Markus Pesch	6e8a6e70f7	fix(ci): define container-runtime Some checks failed build-x86_64 Details build / build-x86_64 (push) Failing after 14s Details	2023-05-21 13:07:15 +02:00
Markus Pesch	bcf0eed0a9	Merge pull request 'chore(deps): update dependency quay.io/skopeo/stable to v1.12.0' (#18 ) from renovate/quay.io-skopeo-stable-1.x into master Some checks failed build-x86_64 Details Reviewed-on: #18	2023-05-21 10:47:09 +00:00
CSRBot	ab620531ed	chore(deps): update dependency quay.io/skopeo/stable to v1.12.0 Some checks failed build-x86_64 Details	2023-05-18 13:58:38 +02:00
Markus Pesch	fc500c5605	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:52:33 +02:00
Markus Pesch	ceebed25a0	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:47:38 +02:00
Markus Pesch	55a7affa1a	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:46:57 +02:00
Markus Pesch	50ca134431	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:46:18 +02:00
Markus Pesch	1824582a49	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:45:21 +02:00
Markus Pesch	5b98632bbf	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:40:02 +02:00
Markus Pesch	5a8f64a0ff	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:39:27 +02:00
Markus Pesch	1fa4eadfc4	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:39:03 +02:00
Markus Pesch	67f6b13bae	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:29:23 +02:00
Markus Pesch	441402ae5c	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:28:39 +02:00
Markus Pesch	5c87f90b5d	fix(ci): migrate to gitea actions Some checks failed build-x86_64 Details	2023-04-13 22:20:21 +02:00
Markus Pesch	4b46541ba2	fix(ci): migrate to gitea actions	2023-04-13 22:19:39 +02:00