Compare commits

..

No commits in common. "master" and "1.5.4" have entirely different histories.

5 changed files with 68 additions and 273 deletions

View File

@ -3,20 +3,14 @@ kind: pipeline
type: kubernetes type: kubernetes
name: linter name: linter
clone:
disable: true
platform: platform:
os: linux os: linux
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: markdown lint - name: markdown lint
commands: commands:
- markdownlint *.md - markdownlint *.md
image: git.cryptic.systems/volker.raschek/markdownlint:0.41.0 image: docker.io/volkerraschek/markdownlint:0.32.2
resources: resources:
limits: limits:
cpu: 150 cpu: 150
@ -34,7 +28,7 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: resources:
limits: limits:
cpu: 150 cpu: 150
@ -54,22 +48,13 @@ kind: pipeline
type: docker type: docker
name: dry-run-amd64 name: dry-run-amd64
clone:
disable: true
depends_on:
- linter
platform: platform:
os: linux os: linux
arch: amd64 arch: amd64
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build - name: build
image: docker.io/plugins/docker:20.18.3 image: docker.io/plugins/docker:latest
settings: settings:
auto_tag: false auto_tag: false
dockerfile: Dockerfile dockerfile: Dockerfile
@ -77,15 +62,12 @@ steps:
force_tag: true force_tag: true
no_cache: true no_cache: true
purge: true purge: true
mirror: repo: volkerraschek/mkisofs
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/mkisofs
tags: latest-amd64 tags: latest-amd64
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
- name: email-notification - name: email-notification
environment: environment:
@ -99,12 +81,15 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: when:
status: status:
- changed - changed
- failure - failure
depends_on:
- linter
trigger: trigger:
branch: branch:
exclude: exclude:
@ -120,22 +105,13 @@ kind: pipeline
type: docker type: docker
name: dry-run-arm64-v8 name: dry-run-arm64-v8
clone:
disable: true
depends_on:
- linter
platform: platform:
os: linux os: linux
arch: arm64 arch: arm64
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build - name: build
image: docker.io/plugins/docker:20.18.3 image: docker.io/plugins/docker:latest
settings: settings:
auto_tag: false auto_tag: false
dockerfile: Dockerfile dockerfile: Dockerfile
@ -143,15 +119,12 @@ steps:
force_tag: true force_tag: true
no_cache: true no_cache: true
purge: true purge: true
mirror: repo: volkerraschek/mkisofs
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/mkisofs
tags: latest-arm64-v8 tags: latest-arm64-v8
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
- name: email-notification - name: email-notification
environment: environment:
@ -165,12 +138,15 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: when:
status: status:
- changed - changed
- failure - failure
depends_on:
- linter
trigger: trigger:
branch: branch:
exclude: exclude:
@ -186,37 +162,25 @@ kind: pipeline
type: docker type: docker
name: latest-amd64 name: latest-amd64
clone:
disable: true
depends_on:
- linter
platform: platform:
os: linux os: linux
arch: amd64 arch: amd64
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build - name: build
image: docker.io/plugins/docker:20.18.3 image: docker.io/plugins/docker:latest
settings: settings:
auto_tag: false auto_tag: false
dockerfile: Dockerfile dockerfile: Dockerfile
force_tag: true force_tag: true
no_cache: true no_cache: true
purge: true purge: true
mirror: repo: volkerraschek/mkisofs
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/mkisofs
tags: latest-amd64 tags: latest-amd64
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
- name: email-notification - name: email-notification
environment: environment:
@ -230,12 +194,15 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: when:
status: status:
- changed - changed
- failure - failure
depends_on:
- linter
trigger: trigger:
branch: branch:
- master - master
@ -250,37 +217,25 @@ kind: pipeline
type: docker type: docker
name: latest-arm64-v8 name: latest-arm64-v8
clone:
disable: true
depends_on:
- linter
platform: platform:
os: linux os: linux
arch: arm64 arch: arm64
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build - name: build
image: docker.io/plugins/docker:20.18.3 image: docker.io/plugins/docker:latest
settings: settings:
auto_tag: false auto_tag: false
dockerfile: Dockerfile dockerfile: Dockerfile
force_tag: true force_tag: true
no_cache: true no_cache: true
purge: true purge: true
mirror: repo: volkerraschek/mkisofs
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/mkisofs
tags: latest-arm64-v8 tags: latest-arm64-v8
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
- name: email-notification - name: email-notification
environment: environment:
@ -294,12 +249,15 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: when:
status: status:
- changed - changed
- failure - failure
depends_on:
- linter
trigger: trigger:
branch: branch:
- master - master
@ -314,32 +272,17 @@ kind: pipeline
type: kubernetes type: kubernetes
name: latest-manifest 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: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build-manifest - name: build-manifest
image: docker.io/plugins/manifest:1.4.0 image: docker.io/plugins/manifest:latest
settings: settings:
auto_tag: false auto_tag: false
ignore_missing: true ignore_missing: true
spec: manifest.tmpl spec: manifest.tmpl
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
- name: email-notification - name: email-notification
environment: environment:
@ -353,7 +296,7 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: resources:
limits: limits:
cpu: 150 cpu: 150
@ -363,65 +306,9 @@ steps:
- changed - changed
- failure - failure
trigger:
branch:
- master
event:
- cron
- push
repo:
- volker.raschek/mkisofs-docker
---
kind: pipeline
type: kubernetes
name: latest-sync
clone:
disable: true
depends_on: depends_on:
- latest-manifest - latest-amd64
- latest-arm64-v8
steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: latest-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/mkisofs docker.io/volkerraschek
environment:
SRC_CRED_USERNAME:
from_secret: git_cryptic_systems_container_registry_user
SRC_CRED_PASSWORD:
from_secret: git_cryptic_systems_container_registry_password
DEST_CRED_USERNAME:
from_secret: container_image_registry_user
DEST_CRED_PASSWORD:
from_secret: container_image_registry_password
image: quay.io/skopeo/stable:v1.16.1
- 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: git.cryptic.systems/volker.raschek/drone-email:0.1.5
resources:
limits:
cpu: 150
memory: 150M
when:
status:
- changed
- failure
trigger: trigger:
branch: branch:
@ -437,34 +324,25 @@ kind: pipeline
type: docker type: docker
name: tagged-amd64 name: tagged-amd64
clone:
disable: true
platform: platform:
os: linux os: linux
arch: amd64 arch: amd64
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build - name: build
image: docker.io/plugins/docker:20.18.3 image: docker.io/plugins/docker:latest
settings: settings:
auto_tag: true
auto_tag_suffix: amd64 auto_tag_suffix: amd64
auto_tag: true
dockerfile: Dockerfile dockerfile: Dockerfile
force_tag: true force_tag: true
no_cache: true no_cache: true
purge: true purge: true
mirror: repo: volkerraschek/mkisofs
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/mkisofs
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
build_args: build_args:
- MKISOFS_VERSION=${DRONE_TAG} - MKISOFS_VERSION=${DRONE_TAG}
@ -480,7 +358,7 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: when:
status: status:
- changed - changed
@ -497,34 +375,25 @@ kind: pipeline
type: docker type: docker
name: tagged-arm64-v8 name: tagged-arm64-v8
clone:
disable: true
platform: platform:
os: linux os: linux
arch: arm64 arch: arm64
steps: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build - name: build
image: docker.io/plugins/docker:20.18.3 image: docker.io/plugins/docker:latest
settings: settings:
auto_tag: true
auto_tag_suffix: arm64-v8 auto_tag_suffix: arm64-v8
auto_tag: true
dockerfile: Dockerfile dockerfile: Dockerfile
force_tag: true force_tag: true
no_cache: true no_cache: true
purge: true purge: true
mirror: repo: volkerraschek/mkisofs
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/mkisofs
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
build_args: build_args:
- MKISOFS_VERSION=${DRONE_TAG} - MKISOFS_VERSION=${DRONE_TAG}
@ -540,7 +409,7 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: when:
status: status:
- changed - changed
@ -557,32 +426,17 @@ kind: pipeline
type: kubernetes type: kubernetes
name: tagged-manifest 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: steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: build-manifest - name: build-manifest
image: docker.io/plugins/manifest:1.4.0 image: docker.io/plugins/manifest:latest
settings: settings:
auto_tag: true auto_tag: true
ignore_missing: true ignore_missing: true
spec: manifest.tmpl spec: manifest.tmpl
username: username:
from_secret: git_cryptic_systems_container_registry_user from_secret: container_image_registry_user
password: password:
from_secret: git_cryptic_systems_container_registry_password from_secret: container_image_registry_password
- name: email-notification - name: email-notification
environment: environment:
@ -596,7 +450,7 @@ steps:
from_secret: smtp_username from_secret: smtp_username
SMTP_PASSWORD: SMTP_PASSWORD:
from_secret: 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: resources:
limits: limits:
cpu: 150 cpu: 150
@ -606,62 +460,9 @@ steps:
- changed - changed
- failure - failure
trigger:
event:
- tag
repo:
- volker.raschek/mkisofs-docker
---
kind: pipeline
type: kubernetes
name: tagged-sync
clone:
disable: true
depends_on: depends_on:
- tagged-manifest - tagged-amd64
- tagged-arm64-v8
steps:
- name: clone
image: git.cryptic.systems/volker.raschek/git:1.3.1
- name: tagged-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/mkisofs docker.io/volkerraschek
environment:
SRC_CRED_USERNAME:
from_secret: git_cryptic_systems_container_registry_user
SRC_CRED_PASSWORD:
from_secret: git_cryptic_systems_container_registry_password
DEST_CRED_USERNAME:
from_secret: container_image_registry_user
DEST_CRED_PASSWORD:
from_secret: container_image_registry_password
image: quay.io/skopeo/stable:v1.16.1
- 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: git.cryptic.systems/volker.raschek/drone-email:0.1.5
resources:
limits:
cpu: 150
memory: 150M
when:
status:
- changed
- failure
trigger: trigger:
event: event:

View File

@ -1,9 +1,9 @@
FROM docker.io/library/rockylinux:9.3.20231119 FROM docker.io/library/rockylinux:9.0
ARG MKISOFS_VERSION ARG MKISOFS_VERSION
RUN yum update --assumeyes && \ RUN yum update --assumeyes && \
yum install --assumeyes bash bash-completion yum install --assumeyes bash curl
RUN if [ -z ${MKISOFS_VERSION+x} ]; then \ RUN if [ -z ${MKISOFS_VERSION+x} ]; then \
yum install --assumeyes xorriso; \ yum install --assumeyes xorriso; \

View File

@ -9,8 +9,8 @@ CONTAINER_RUNTIME?=$(shell which podman)
# MKISOFS_IMAGE_REGISTRY_NAME # MKISOFS_IMAGE_REGISTRY_NAME
# Defines the name of the new container to be built using several variables. # Defines the name of the new container to be built using several variables.
MKISOFS_IMAGE_REGISTRY_NAME:=git.cryptic.systems MKISOFS_IMAGE_REGISTRY_NAME:=docker.io
MKISOFS_IMAGE_REGISTRY_USER:=volker.raschek MKISOFS_IMAGE_REGISTRY_USER:=volkerraschek
MKISOFS_IMAGE_NAMESPACE?=${MKISOFS_IMAGE_REGISTRY_USER} MKISOFS_IMAGE_NAMESPACE?=${MKISOFS_IMAGE_REGISTRY_USER}
MKISOFS_IMAGE_NAME:=mkisofs MKISOFS_IMAGE_NAME:=mkisofs

View File

@ -1,4 +1,4 @@
image: git.cryptic.systems/volker.raschek/mkisofs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} image: volkerraschek/mkisofs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
{{#if build.tags}} {{#if build.tags}}
tags: tags:
{{#each build.tags}} {{#each build.tags}}
@ -8,13 +8,13 @@ tags:
{{/if}} {{/if}}
manifests: manifests:
- -
image: git.cryptic.systems/volker.raschek/mkisofs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64 image: volkerraschek/mkisofs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
platform: platform:
architecture: amd64 architecture: amd64
os: linux os: linux
- -
image: git.cryptic.systems/volker.raschek/mkisofs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8 image: volkerraschek/mkisofs:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
platform: platform:
architecture: arm64 architecture: arm64
os: linux os: linux
variant: v8 variant: v8

View File

@ -1,6 +1,8 @@
{ {
"$schema": "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"assignees": [ "volker.raschek" ], "assignees": [ "volker.raschek" ],
"automergeStrategy": "merge-commit",
"automergeType": "pr",
"labels": [ "renovate" ], "labels": [ "renovate" ],
"packageRules": [ "packageRules": [
{ {
@ -8,14 +10,6 @@
"automerge": true, "automerge": true,
"matchManagers": "droneci", "matchManagers": "droneci",
"matchUpdateTypes": [ "minor", "patch"] "matchUpdateTypes": [ "minor", "patch"]
},
{
"description": "Automatically update patch version of used container images in docker files",
"addLabels": [ "renovate/container-image", "renovate/automerge" ],
"automerge": true,
"matchBaseBranches": [ "master" ],
"matchManagers": [ "dockerfile" ],
"matchUpdateTypes": [ "patch" ]
} }
], ],
"rebaseLabel": "renovate/rebase", "rebaseLabel": "renovate/rebase",