Compare commits

..

No commits in common. "main" and "v6.0.3+1" have entirely different histories.

5 changed files with 28 additions and 28 deletions

View File

@ -6,14 +6,14 @@ when:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
steps: steps:
- name: security-build security-build:
image: quay.io/thegeeklab/wp-docker-buildx:5 image: quay.io/thegeeklab/wp-docker-buildx:2
settings: settings:
containerfile: Containerfile.multiarch containerfile: Containerfile.multiarch
output: type=oci,dest=oci/${CI_REPO_NAME},tar=false output: type=oci,dest=oci/${CI_REPO_NAME},tar=false
repo: thegeeklab/${CI_REPO_NAME} repo: thegeeklab/${CI_REPO_NAME}
- name: security-scan security-scan:
image: ghcr.io/aquasecurity/trivy image: ghcr.io/aquasecurity/trivy
commands: commands:
- trivy -v - trivy -v
@ -25,9 +25,9 @@ steps:
TRIVY_SEVERITY: HIGH,CRITICAL TRIVY_SEVERITY: HIGH,CRITICAL
TRIVY_TIMEOUT: 1m TRIVY_TIMEOUT: 1m
- name: publish-dockerhub publish-dockerhub:
image: quay.io/thegeeklab/wp-docker-buildx:5
group: container group: container
image: quay.io/thegeeklab/wp-docker-buildx:2
settings: settings:
auto_tag: true auto_tag: true
containerfile: Containerfile.multiarch containerfile: Containerfile.multiarch
@ -46,9 +46,9 @@ steps:
branch: branch:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
- name: publish-quay publish-quay:
image: quay.io/thegeeklab/wp-docker-buildx:5
group: container group: container
image: quay.io/thegeeklab/wp-docker-buildx:2
settings: settings:
auto_tag: true auto_tag: true
containerfile: Containerfile.multiarch containerfile: Containerfile.multiarch

View File

@ -6,20 +6,22 @@ when:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
steps: steps:
- name: changelog changelog:
image: quay.io/thegeeklab/git-sv image: quay.io/thegeeklab/git-sv
commands: commands:
- git fetch --depth=2147483647
- git sv current-version - git sv current-version
- git sv release-notes -t ${CI_COMMIT_TAG:-next} -o CHANGELOG.md - git sv release-notes -t ${CI_COMMIT_TAG:-next} -o CHANGELOG.md
- cat CHANGELOG.md - cat CHANGELOG.md
- name: publish-gitea publish-gitea:
image: quay.io/thegeeklab/wp-gitea-release image: plugins/gitea-release
settings: settings:
api_key: api_key:
from_secret: gitea_token from_secret: gitea_token
base_url: https://gitea.rknet.org base_url: https://gitea.rknet.org
note: CHANGELOG.md note: CHANGELOG.md
overwrite: true
title: ${CI_COMMIT_TAG} title: ${CI_COMMIT_TAG}
when: when:
- event: [tag] - event: [tag]

View File

@ -6,27 +6,26 @@ when:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
steps: steps:
- name: markdownlint markdownlint:
image: quay.io/thegeeklab/markdownlint-cli image: quay.io/thegeeklab/markdownlint-cli
group: test
commands: commands:
- markdownlint 'README.md' - markdownlint 'README.md'
- name: spellcheck spellcheck:
image: quay.io/thegeeklab/alpine-tools image: quay.io/thegeeklab/alpine-tools
group: test
commands: commands:
- spellchecker --files '_docs/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls - spellchecker --files '_docs/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls
environment: environment:
FORCE_COLOR: "true" FORCE_COLOR: "true"
NPM_CONFIG_LOGLEVEL: "error"
- name: link-validation link-validation:
image: docker.io/lycheeverse/lychee image: docker.io/lycheeverse/lychee
group: test group: test
commands: commands:
- lychee --no-progress --format detailed README.md - lychee --no-progress --format detailed README.md
- name: pushrm-dockerhub pushrm-dockerhub:
image: docker.io/chko/docker-pushrm:1 image: docker.io/chko/docker-pushrm:1
secrets: secrets:
- source: docker_password - source: docker_password
@ -43,7 +42,7 @@ steps:
- ${CI_REPO_DEFAULT_BRANCH} - ${CI_REPO_DEFAULT_BRANCH}
status: [success] status: [success]
- name: pushrm-quay pushrm-quay:
image: docker.io/chko/docker-pushrm:1 image: docker.io/chko/docker-pushrm:1
secrets: secrets:
- source: quay_token - source: quay_token

View File

@ -8,17 +8,17 @@ when:
runs_on: [success, failure] runs_on: [success, failure]
steps: steps:
- name: matrix matrix:
image: quay.io/thegeeklab/wp-matrix image: quay.io/thegeeklab/wp-matrix
settings: settings:
homeserver: homeserver:
from_secret: matrix_homeserver from_secret: matrix_homeserver
room_id: password:
from_secret: matrix_room_id from_secret: matrix_password
user_id: roomid:
from_secret: matrix_user_id from_secret: matrix_roomid
access_token: username:
from_secret: matrix_access_token from_secret: matrix_username
when: when:
- status: [success, failure] - status: [success, failure]

View File

@ -1,4 +1,4 @@
FROM docker.io/python:3.12-alpine@sha256:c2f41e6a5a67bc39b95be3988dd19fbd05d1b82375c46d9826c592cca014d4de FROM docker.io/python:3.12-alpine@sha256:c793b92fd9e0e2a0b611756788a033d569ca864b733461c8fb30cfd14847dbcf
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>" LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -11,9 +11,9 @@ ARG ANSIBLE_VERSION
ARG MOLECULE_VERSION ARG MOLECULE_VERSION
# renovate: datasource=pypi depName=molecule # renovate: datasource=pypi depName=molecule
ENV MOLECULE_VERSION="${MOLECULE_VERSION:-24.7.0}" ENV MOLECULE_VERSION="${MOLECULE_VERSION:-6.0.3}"
# renovate: datasource=pypi depName=ansible # renovate: datasource=pypi depName=ansible
ENV ANSIBLE_VERSION="${ANSIBLE_VERSION:-10.2.0}" ENV ANSIBLE_VERSION="${ANSIBLE_VERSION:-9.1.0}"
ENV PY_COLORS=1 ENV PY_COLORS=1
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
@ -24,7 +24,6 @@ COPY overlay/ /
RUN apk add --update --no-cache --virtual .build-deps build-base libffi-dev musl-dev openssl-dev python3-dev cargo && \ RUN apk add --update --no-cache --virtual .build-deps build-base libffi-dev musl-dev openssl-dev python3-dev cargo && \
apk add --update --no-cache git openssh-client && \ apk add --update --no-cache git openssh-client && \
apk upgrade --no-cache libexpat && \
echo "Installing requirements ..." && \ echo "Installing requirements ..." && \
pip install -qq --no-cache-dir --upgrade pip && \ pip install -qq --no-cache-dir --upgrade pip && \
pip install -qq --no-cache-dir boto boto3 botocore apache-libcloud hcloud \ pip install -qq --no-cache-dir boto boto3 botocore apache-libcloud hcloud \