fix: correct auto tag suffix

Reviewed-on: #5

.drone.yml

@@ -5,17 +5,16 @@ name: linter
 
 platform:
   os: linux
-  arch: amd64
 
 steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.28.1
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
-      cpu: 50
-      memory: 50M
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
@@ -30,8 +29,8 @@ steps:
   image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -41,6 +40,193 @@ trigger:
   event:
     exclude:
     - tag
+
+---
+kind: pipeline
+type: docker
+name: dry-run-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    auto_tag: false
+    dry_run: true
+    force_tag: true
+    no_cache: true
+    purge: true
+    tags: latest-amd64
+    repo: volkerraschek/markdownlint
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+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
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    auto_tag: false
+    dry_run: true
+    force_tag: true
+    no_cache: true
+    purge: true
+    tags: latest-arm-v7
+    repo: volkerraschek/markdownlint
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    auto_tag: false
+    dry_run: true
+    force_tag: true
+    no_cache: true
+    purge: true
+    tags: latest-arm64-v8
+    repo: volkerraschek/markdownlint
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
+trigger:
+  branch:
+    exclude:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
+
 ---
 kind: pipeline
 type: docker
@@ -52,26 +238,24 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    force_tag: true
+    no_cache: true
+    purge: true
     tags: latest-amd64
     repo: volkerraschek/markdownlint
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
-  when:
-    branch:
-    - master
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -91,15 +275,22 @@ volumes:
   host:
     path: /var/run/docker.sock
 
+depends_on:
+- linter
+
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
 
 ---
 kind: pipeline
 type: docker
-name: latest-armv7
+name: latest-arm-v7
 
 platform:
   os: linux
@@ -107,23 +298,21 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-armv7
+    force_tag: true
+    no_cache: true
+    purge: true
+    tags: latest-arm-v7
     repo: volkerraschek/markdownlint
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
-  when:
-    branch:
-    - master
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -146,10 +335,77 @@ volumes:
   host:
     path: /var/run/docker.sock
 
+depends_on:
+- linter
+
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
+
+---
+kind: pipeline
+type: docker
+name: latest-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    auto_tag: false
+    force_tag: true
+    no_cache: true
+    purge: true
+    tags: latest-arm64-v8
+    repo: volkerraschek/markdownlint
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+- linter
+
+trigger:
+  branch:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
 
 ---
 kind: pipeline
@@ -158,7 +414,7 @@ name: latest-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: false
     ignore_missing: true
@@ -181,8 +437,8 @@ steps:
       from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -190,12 +446,17 @@ steps:
 
 depends_on:
 - latest-amd64
-- latest-armv7
+- latest-arm-v7
+- latest-arm64-v8
 
 trigger:
+  branch:
+  - master
   event:
-    exclude:
-    - tag
+  - cron
+  - push
+  repo:
+  - volker.raschek/markdownlint-docker
 
 ---
 kind: pipeline
@@ -208,11 +469,13 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
-    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: amd64
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/markdownlint
     username:
       from_secret: container_image_registry_user
@@ -220,13 +483,12 @@ steps:
       from_secret: container_image_registry_password
     build_args:
     - MARKDOWNLINT_VERSION=${DRONE_TAG}
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -255,7 +517,7 @@ trigger:
 ---
 kind: pipeline
 type: docker
-name: tagged-armv7
+name: tagged-arm-v7
 
 platform:
   os: linux
@@ -263,11 +525,13 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
-    dockerfile: Dockerfile
     auto_tag: true
-    auto_tag_suffix: armv7
+    auto_tag_suffix: arm-v7
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/markdownlint
     username:
       from_secret: container_image_registry_user
@@ -275,13 +539,68 @@ steps:
       from_secret: container_image_registry_password
     build_args:
     - MARKDOWNLINT_VERSION=${DRONE_TAG}
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
 
 - name: notify
-  image: drillster/drone-email
+  image: docker.io/drillster/drone-email:latest
+  environment:
+    PLUGIN_HOST:
+      from_secret: smtp_host
+    PLUGIN_USERNAME:
+      from_secret: smtp_username
+    PLUGIN_PASSWORD:
+      from_secret: smtp_password
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  when:
+    status:
+    - changed
+    - failure
+
+volumes:
+- name: docker_socket
+  host:
+    path: /var/run/docker.sock
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/markdownlint-docker
+
+---
+kind: pipeline
+type: docker
+name: tagged-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    auto_tag: true
+    auto_tag_suffix: arm64-v8
+    force_tag: true
+    no_cache: true
+    purge: true
+    repo: volkerraschek/markdownlint
+    username:
+      from_secret: container_image_registry_user
+    password:
+      from_secret: container_image_registry_password
+    build_args:
+    - MARKDOWNLINT_VERSION=${DRONE_TAG}
+  volumes:
+  - name: docker_socket
+    path: /var/run/docker.sock
+
+- name: notify
+  image: docker.io/drillster/drone-email:latest
   environment:
     PLUGIN_HOST:
       from_secret: smtp_host
@@ -314,7 +633,7 @@ name: tagged-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: true
     ignore_missing: true
@@ -337,8 +656,8 @@ steps:
       from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -346,59 +665,11 @@ steps:
 
 depends_on:
 - tagged-amd64
-- tagged-armv7
+- tagged-arm-v7
+- tagged-arm64-v8
 
 trigger:
   event:
   - tag
   repo:
   - volker.raschek/markdownlint-docker
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/markdownlint-docker.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - push
-  repo:
-  - volker.raschek/markdownlint-docker

Dockerfile

@@ -1,18 +1,19 @@
-FROM docker.io/library/alpine:3.12
+FROM docker.io/library/node:lts-alpine3.16 AS build
 
-ARG NODEJS_VERSION=12.22.6-r0
-ARG MARKDOWNLINT_VERSION
+ARG MARKDOWNLINT_VERSION=master
 
 RUN set -ex && \
-    apk add --no-cache nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION}
+    apk update && \
+    apk upgrade && \
+    apk add --no-cache git
 
-RUN if [ ! -z "${MARKDOWNLINT_VERSION}" ]; then set -ex; npm install -g markdownlint-cli@${MARKDOWNLINT_VERSION}; fi
-RUN if [ -z "${MARKDOWNLINT_VERSION}" ]; then set -ex; npm install -g markdownlint-cli; fi
-
-RUN set -ex && \
-    npm cache clean --force && \
-    apk del nodejs-npm
+RUN git clone --branch ${MARKDOWNLINT_VERSION} https://github.com/igorshubovych/markdownlint-cli /markdownlint && \
+    cd /markdownlint && \
+    npm install --production && \
+    npm install --global
 
 WORKDIR /work
-ENTRYPOINT ["/usr/bin/markdownlint"]
-CMD ["."]
+
+RUN ln -fs /work /workspace
+
+ENTRYPOINT [ "/usr/local/bin/markdownlint" ]

Makefile

@@ -1,12 +1,11 @@
 # MARKDOWNLINT_VERSION
 # Only required to install a specifiy version
-MARKDOWNLINT_VERSION?=
-
+MARKDOWNLINT_VERSION?=v0.32.0 # renovate: datasource=github-releases depName=igorshubovych/markdownlint-cli
 
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a
 # container runtime. This is needed to start and run a container image.
-CONTAINER_RUNTIME?=$(shell which docker)
+CONTAINER_RUNTIME?=$(shell which podman)
 
 # MARKDOWNLINT_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.

README.md

@@ -0,0 +1,13 @@
+# markdownlint-docker
+
+[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/markdownlint-docker/status.svg)](https://drone.cryptic.systems/volker.raschek/markdownlint-docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/markdownlint)](https://hub.docker.com/r/volkerraschek/markdownlint)
+
+This project contains all sources to build the container image
+`docker.io/volkerraschek/markdownlint`. The primary goal of this project is to
+packge the binary `markdownlint-ci` as container image. The source code of the
+binary can be found in the upstream project of
+[igorshubovych](https://github.com/igorshubovych/markdownlint-cli).
+
+The workflow or how `markdownlint-ci` can in general be used is documented
+[here](https://github.com/igorshubovych/markdownlint-cli#usage).

manifest.tmpl

@@ -13,8 +13,14 @@ manifests:
       architecture: amd64
       os: linux
   -
-    image: volkerraschek/markdownlint:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-armv7
+    image: volkerraschek/markdownlint:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7
     platform:
       architecture: arm
       os: linux
-      variant: v7
+      variant: v7
+  -
+    image: volkerraschek/markdownlint:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8

renovate.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "assignees": [ "volker.raschek" ],
+  "automergeStrategy": "merge-commit",
+  "automergeType": "pr",
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/markdownlint-cli", "renovate/automerge" ],
+      "automerge": false,
+      "matchPackageNames": [ "markdownlint-cli" ],
+      "matchManagers": [ "regex" ]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch",
+  "regexManagers": [
+    {
+      "description": "Update version",
+      "fileMatch": [
+        "^Makefile$"
+      ],
+      "matchStrings": [
+        "MARKDOWNLINT_VERSION\\?=(?<currentValue>.*) # renovate: datasource=(?<datasource>.*) depName=(?<depName>.*) (lookupName=(?<lookupName>.*))? (versioning=(?<versioning>.*))?"
+      ]
+    }
+  ]
+}