diff --git a/.chglog/config.yml b/.chglog/config.yml
index 7e71f35..6853a89 100755
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@@ -2,7 +2,7 @@ style: github
template: CHANGELOG.tpl.md
info:
title: CHANGELOG
- repository_url: https://gitea.rknet.org/docker/molecule
+ repository_url: https://gitea.rknet.org/container/molecule
options:
commit_groups:
title_maps:
diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index c18a5f4..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,197 +0,0 @@
----
-kind: pipeline
-name: test
-
-platform:
- os: linux
- arch: amd64
-
-steps:
- - name: markdownlint
- image: thegeeklab/markdownlint-cli
- commands:
- - markdownlint 'README.md'
-
-trigger:
- ref:
- - refs/heads/main
- - refs/pull/**
- - refs/tags/**
-
----
-kind: pipeline
-name: build-container
-
-platform:
- os: linux
- arch: amd64
-
-steps:
- - name: dryrun
- image: thegeeklab/drone-docker-buildx:23
- settings:
- dockerfile: Dockerfile
- dry_run: true
- provenance: false
- repo: thegeeklab/${DRONE_REPO_NAME}
- when:
- ref:
- - refs/pull/**
-
- - name: tags
- image: thegeeklab/docker-autotag
- environment:
- DOCKER_AUTOTAG_FORCE_LATEST: True
- DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
- DOCKER_AUTOTAG_OUTPUT_FILE: .tags
- DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
- when:
- ref:
- - refs/heads/main
- - refs/tags/**
- depends_on:
- - dryrun
-
- - name: changelog-generate
- image: thegeeklab/git-chglog
- commands:
- - git fetch -tq
- - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
- depends_on:
- - tags
-
- - name: changelog-format
- image: thegeeklab/alpine-tools
- commands:
- - prettier CHANGELOG.md
- - prettier -w CHANGELOG.md
- depends_on:
- - changelog-generate
-
- - name: publish-dockerhub
- image: thegeeklab/drone-docker-buildx:23
- settings:
- dockerfile: Dockerfile
- password:
- from_secret: docker_password
- provenance: false
- repo: thegeeklab/${DRONE_REPO_NAME}
- username:
- from_secret: docker_username
- when:
- ref:
- - refs/heads/main
- - refs/tags/**
- depends_on:
- - changelog-format
-
- - name: publish-quay
- image: thegeeklab/drone-docker-buildx:23
- settings:
- dockerfile: Dockerfile
- password:
- from_secret: quay_password
- provenance: false
- registry: quay.io
- repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
- username:
- from_secret: quay_username
- when:
- ref:
- - refs/heads/main
- - refs/tags/**
- depends_on:
- - changelog-format
-
- - name: publish-gitea
- image: plugins/gitea-release
- settings:
- api_key:
- from_secret: gitea_token
- base_url: https://gitea.rknet.org
- note: CHANGELOG.md
- overwrite: true
- title: ${DRONE_TAG}
- when:
- ref:
- - refs/tags/**
- depends_on:
- - publish-dockerhub
- - publish-quay
-
-trigger:
- ref:
- - refs/heads/main
- - refs/pull/**
- - refs/tags/**
-
-depends_on:
- - test
-
----
-kind: pipeline
-name: notifications
-
-platform:
- os: linux
- arch: amd64
-
-steps:
- - name: pushrm-dockerhub
- image: chko/docker-pushrm:1
- environment:
- DOCKER_PASS:
- from_secret: docker_password
- DOCKER_USER:
- from_secret: docker_username
- PUSHRM_FILE: README.md
- PUSHRM_SHORT: Custom image for Molecule Ansible test automation
- PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
- when:
- status:
- - success
-
- - name: pushrm-quay
- image: chko/docker-pushrm:1
- environment:
- APIKEY__QUAY_IO:
- from_secret: quay_token
- PUSHRM_FILE: README.md
- PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
- when:
- status:
- - success
-
- - name: matrix
- image: thegeeklab/drone-matrix
- settings:
- homeserver:
- from_secret: matrix_homeserver
- password:
- from_secret: matrix_password
- roomid:
- from_secret: matrix_roomid
- template: "Status: **{{ .Build.Status }}**
Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}
Message: {{ .Commit.Message.Title }}"
- username:
- from_secret: matrix_username
- when:
- status:
- - success
- - failure
-
-trigger:
- ref:
- - refs/heads/main
- - refs/tags/**
- status:
- - success
- - failure
-
-depends_on:
- - build-container
-
----
-kind: signature
-hmac: fc3bf906b261a2c27f8ba36cc56f76dba5efe59e16a29b6b2698044e418a84a2
-
-...
diff --git a/.gitsv/config.yml b/.gitsv/config.yml
new file mode 100644
index 0000000..acaf506
--- /dev/null
+++ b/.gitsv/config.yml
@@ -0,0 +1,47 @@
+---
+version: "1.1"
+
+versioning:
+ update-major: []
+ update-minor: [feat]
+ update-patch: [fix, perf, refactor, chore, test, ci, docs]
+
+tag:
+ pattern: "v%d.%d.%d"
+
+release-notes:
+ sections:
+ - name: Features
+ commit-types: [feat]
+ section-type: commits
+ - name: Bug Fixes
+ commit-types: [fix]
+ section-type: commits
+ - name: Performance Improvements
+ commit-types: [perf]
+ section-type: commits
+ - name: Code Refactoring
+ commit-types: [refactor]
+ section-type: commits
+ - name: Others
+ commit-types: [chore]
+ section-type: commits
+ - name: Testing
+ commit-types: [test]
+ section-type: commits
+ - name: CI Pipeline
+ commit-types: [ci]
+ section-type: commits
+ - name: Documentation
+ commit-types: [docs]
+ section-type: commits
+ - name: BREAKING CHANGES
+ section-type: breaking-changes
+
+commit-message:
+ footer:
+ issue:
+ key: issue
+ add-value-prefix: "#"
+ issue:
+ regex: "#?[0-9]+"
diff --git a/.prettierignore b/.prettierignore
index 23a4f05..135c35d 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,2 @@
-.drone.yml
*.tpl.md
LICENSE
diff --git a/.woodpecker/build-container.yml b/.woodpecker/build-container.yml
new file mode 100644
index 0000000..f9f34b7
--- /dev/null
+++ b/.woodpecker/build-container.yml
@@ -0,0 +1,72 @@
+---
+when:
+ - event: [pull_request, tag]
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+ security-build:
+ image: quay.io/thegeeklab/wp-docker-buildx:1
+ settings:
+ containerfile: Containerfile.multiarch
+ output: type=oci,dest=oci/${CI_REPO_NAME},tar=false
+ repo: thegeeklab/${CI_REPO_NAME}
+
+ security-scan:
+ image: ghcr.io/aquasecurity/trivy
+ commands:
+ - trivy -v
+ - trivy image --input oci/${CI_REPO_NAME}
+ environment:
+ TRIVY_EXIT_CODE: "1"
+ TRIVY_IGNORE_UNFIXED: "true"
+ TRIVY_NO_PROGRESS: "true"
+ TRIVY_SEVERITY: HIGH,CRITICAL
+ TRIVY_TIMEOUT: 1m
+ TRIVY_SKIP_FILES: /usr/local/bin/gomplate
+
+ publish-dockerhub:
+ group: container
+ image: quay.io/thegeeklab/wp-docker-buildx:1
+ settings:
+ auto_tag: true
+ containerfile: Containerfile.multiarch
+ password:
+ from_secret: docker_password
+ platforms:
+ - linux/amd64
+ - linux/arm64
+ - linux/arm/v7
+ provenance: false
+ repo: thegeeklab/${CI_REPO_NAME}
+ username:
+ from_secret: docker_username
+ when:
+ - event: [tag]
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+
+ publish-quay:
+ group: container
+ image: quay.io/thegeeklab/wp-docker-buildx:1
+ settings:
+ auto_tag: true
+ containerfile: Containerfile.multiarch
+ password:
+ from_secret: quay_password
+ platforms:
+ - linux/amd64
+ - linux/arm64
+ - linux/arm/v7
+ provenance: false
+ registry: quay.io
+ repo: quay.io/thegeeklab/${CI_REPO_NAME}
+ username:
+ from_secret: quay_username
+ when:
+ - event: [tag]
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
diff --git a/.woodpecker/build-package.yml b/.woodpecker/build-package.yml
new file mode 100644
index 0000000..34a8589
--- /dev/null
+++ b/.woodpecker/build-package.yml
@@ -0,0 +1,27 @@
+---
+when:
+ - event: [pull_request, tag]
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+ changelog:
+ image: quay.io/thegeeklab/git-sv
+ commands:
+ - git fetch --depth=2147483647
+ - git sv current-version
+ - git sv release-notes -t ${CI_COMMIT_TAG:-next} -o CHANGELOG.md
+ - cat CHANGELOG.md
+
+ publish-gitea:
+ image: plugins/gitea-release
+ settings:
+ api_key:
+ from_secret: gitea_token
+ base_url: https://gitea.rknet.org
+ note: CHANGELOG.md
+ overwrite: true
+ title: ${CI_COMMIT_TAG}
+ when:
+ - event: [tag]
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
new file mode 100644
index 0000000..acafcc7
--- /dev/null
+++ b/.woodpecker/docs.yml
@@ -0,0 +1,61 @@
+---
+when:
+ - event: [pull_request, tag]
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+
+steps:
+ markdownlint:
+ image: quay.io/thegeeklab/markdownlint-cli
+ commands:
+ - markdownlint 'README.md'
+
+ spellcheck:
+ image: quay.io/thegeeklab/alpine-tools
+ commands:
+ - spellchecker --files '_docs/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls
+ environment:
+ FORCE_COLOR: "true"
+ NPM_CONFIG_LOGLEVEL: "error"
+
+ link-validation:
+ image: docker.io/lycheeverse/lychee
+ group: test
+ commands:
+ - lychee --no-progress --format detailed README.md
+
+ pushrm-dockerhub:
+ image: docker.io/chko/docker-pushrm:1
+ secrets:
+ - source: docker_password
+ target: DOCKER_PASS
+ - source: docker_username
+ target: DOCKER_USER
+ environment:
+ PUSHRM_FILE: README.md
+ PUSHRM_SHORT: Custom image for Ansible Molecule test automation
+ PUSHRM_TARGET: thegeeklab/${CI_REPO_NAME}
+ when:
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+ status: [success]
+
+ pushrm-quay:
+ image: docker.io/chko/docker-pushrm:1
+ secrets:
+ - source: quay_token
+ target: APIKEY__QUAY_IO
+ environment:
+ PUSHRM_FILE: README.md
+ PUSHRM_TARGET: quay.io/thegeeklab/${CI_REPO_NAME}
+ when:
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+ status: [success]
+
+depends_on:
+ - build-package
+ - build-container
diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml
new file mode 100644
index 0000000..a851904
--- /dev/null
+++ b/.woodpecker/notify.yml
@@ -0,0 +1,26 @@
+---
+when:
+ - event: [tag]
+ - event: [push, manual]
+ branch:
+ - ${CI_REPO_DEFAULT_BRANCH}
+
+runs_on: [success, failure]
+
+steps:
+ matrix:
+ image: quay.io/thegeeklab/wp-matrix
+ settings:
+ homeserver:
+ from_secret: matrix_homeserver
+ password:
+ from_secret: matrix_password
+ roomid:
+ from_secret: matrix_roomid
+ username:
+ from_secret: matrix_username
+ when:
+ - status: [success, failure]
+
+depends_on:
+ - docs
diff --git a/Dockerfile b/Containerfile.multiarch
similarity index 82%
rename from Dockerfile
rename to Containerfile.multiarch
index 148370c..2ac48c6 100644
--- a/Dockerfile
+++ b/Containerfile.multiarch
@@ -1,17 +1,17 @@
-FROM python:3.12-alpine@sha256:a5d1738d6abbdff3e81c10b7f86923ebcb340ca536e21e8c5ee7d938d263dba1
+FROM docker.io/python:3.12-alpine@sha256:a5d1738d6abbdff3e81c10b7f86923ebcb340ca536e21e8c5ee7d938d263dba1
LABEL maintainer="Robert Kaussow "
LABEL org.opencontainers.image.authors="Robert Kaussow "
LABEL org.opencontainers.image.title="molecule"
-LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/molecule"
-LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/molecule"
-LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/molecule"
+LABEL org.opencontainers.image.url="https://gitea.rknet.org/container/molecule"
+LABEL org.opencontainers.image.source="https://gitea.rknet.org/container/molecule"
+LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/container/molecule"
ARG ANSIBLE_VERSION
-ARG BUILD_VERSION
+ARG MOLECULE_VERSION
# renovate: datasource=pypi depName=molecule
-ENV MOLECULE_VERSION="${BUILD_VERSION:-6.0.2}"
+ENV MOLECULE_VERSION="${MOLECULE_VERSION:-6.0.2}"
# renovate: datasource=pypi depName=ansible
ENV ANSIBLE_VERSION="${ANSIBLE_VERSION:-8.5.0}"
diff --git a/README.md b/README.md
index 53d4c99..cc28eb8 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,18 @@
# molecule
-Custom image for Molecule Ansible test automation
+Custom image for Ansible Molecule test automation
-[![Build Status](https://img.shields.io/drone/build/docker/molecule?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/molecule)
+
+
+[![Build Status](https://ci.rknet.org/api/badges/container/molecule/status.svg)](https://ci.rknet.org/repos/container/molecule)
[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/molecule)
[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/molecule)
-[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/molecule)
-[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/molecule/src/branch/main/LICENSE)
+[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/container/molecule)
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/container/molecule/src/branch/main/LICENSE)
-Custom Docker image to automate Ansible deployment tests with [Molecule](https://molecule.readthedocs.io/en/latest/).
+
+
+Custom container image to automate Ansible deployment tests with [Molecule](https://molecule.readthedocs.io/en/latest/).
## Environment variables
@@ -34,4 +38,4 @@ MOLECULE_ANSIBLE_VAULT_PASSWORD=my_secret
## License
-This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/molecule/src/branch/main/LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/container/molecule/src/branch/main/LICENSE) file for details.