Skip to content

Commit

Permalink
ci: add trivy and replace deprecated workflow syntax (#797)
Browse files Browse the repository at this point in the history
  • Loading branch information
xoxys authored Oct 27, 2024
1 parent 9c77a76 commit 68167b5
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 27 deletions.
29 changes: 19 additions & 10 deletions .woodpecker/build-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,31 @@ steps:
- pip install poetry poetry-dynamic-versioning -qq
- poetry build

- name: dryrun
- name: security-build
image: quay.io/thegeeklab/wp-docker-buildx:5
depends_on: [build]
settings:
containerfile: Containerfile.multiarch
dry_run: true
platforms:
- linux/amd64
- linux/arm64
provenance: false
output: type=oci,dest=oci/${CI_REPO_NAME},tar=false
repo: ${CI_REPO}
when:
- event: [pull_request]

- name: security-scan
image: docker.io/aquasec/trivy
depends_on: [security-build]
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_DB_REPOSITORY: docker.io/aquasec/trivy-db:2

- name: publish-dockerhub
image: quay.io/thegeeklab/wp-docker-buildx:5
group: container
depends_on: [security-scan]
settings:
auto_tag: true
containerfile: Containerfile.multiarch
Expand All @@ -48,7 +57,7 @@ steps:

- name: publish-quay
image: quay.io/thegeeklab/wp-docker-buildx:5
group: container
depends_on: security-scan
settings:
auto_tag: true
containerfile: Containerfile.multiarch
Expand Down
10 changes: 5 additions & 5 deletions .woodpecker/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ steps:

- name: publish-pypi
image: docker.io/library/python:3.12
secrets:
- source: pypi_password
target: POETRY_HTTP_BASIC_PYPI_PASSWORD
- source: pypi_username
target: POETRY_HTTP_BASIC_PYPI_USERNAME
environment:
POETRY_HTTP_BASIC_PYPI_PASSWORD:
from_secret: pypi_password
POETRY_HTTP_BASIC_PYPI_USERNAME:
from_secret: pypi_username
commands:
- pip install poetry poetry-dynamic-versioning -qq
- poetry publish -n
Expand Down
25 changes: 14 additions & 11 deletions .woodpecker/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,41 @@ steps:

- name: markdownlint
image: quay.io/thegeeklab/markdownlint-cli
group: test
depends_on: [assets]
commands:
- markdownlint 'README.md' 'CONTRIBUTING.md'

- name: spellcheck
image: quay.io/thegeeklab/alpine-tools
group: test
depends_on: [assets]
commands:
- spellchecker --files 'docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls
environment:
FORCE_COLOR: "true"

- name: link-validation
image: docker.io/lycheeverse/lychee
group: test
depends_on: [assets]
commands:
- lychee --no-progress --format detailed docs/content README.md

- name: build
image: quay.io/thegeeklab/hugo:0.133.0
depends_on: [link-validation]
commands:
- hugo --panicOnWarning -s docs/

- name: beautify
image: quay.io/thegeeklab/alpine-tools
depends_on: [build]
commands:
- html-beautify -r -f 'docs/public/**/*.html'
environment:
FORCE_COLOR: "true"

- name: publish
image: quay.io/thegeeklab/wp-s3-action
depends_on: [beautify]
settings:
access_key:
from_secret: s3_access_key
Expand All @@ -66,12 +69,12 @@ steps:

- name: pushrm-dockerhub
image: docker.io/chko/docker-pushrm:1
secrets:
- source: docker_password
target: DOCKER_PASS
- source: docker_username
target: DOCKER_USER
depends_on: [publish]
environment:
DOCKER_PASS:
from_secret: docker_password
DOCKER_USER:
from_secret: docker_username
PUSHRM_FILE: README.md
PUSHRM_SHORT: Annotation based documentation for your Ansible roles
PUSHRM_TARGET: ${CI_REPO}
Expand All @@ -83,10 +86,10 @@ steps:

- name: pushrm-quay
image: docker.io/chko/docker-pushrm:1
secrets:
- source: quay_token
target: APIKEY__QUAY_IO
depends_on: [publish]
environment:
APIKEY__QUAY_IO:
from_secret: quay_token
PUSHRM_FILE: README.md
PUSHRM_TARGET: quay.io/${CI_REPO}
when:
Expand Down
3 changes: 3 additions & 0 deletions .woodpecker/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ when:
steps:
- name: check-format
image: docker.io/library/python:3.12
depends_on: []
commands:
- pip install poetry poetry-dynamic-versioning -qq
- poetry install -E ansible-core
Expand All @@ -17,6 +18,7 @@ steps:

- name: check-coding
image: docker.io/library/python:3.12
depends_on: []
commands:
- pip install poetry poetry-dynamic-versioning -qq
- poetry install -E ansible-core
Expand All @@ -26,6 +28,7 @@ steps:

- name: check-jinja
image: docker.io/library/python:3.12
depends_on: []
commands:
- pip install poetry poetry-dynamic-versioning -qq
- poetry install -E ansible-core
Expand Down
2 changes: 1 addition & 1 deletion .woodpecker/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ when:

variables:
- &pytest_base
group: pytest
depends_on: []
commands:
- pip install poetry poetry-dynamic-versioning -qq
- poetry install -E ansible-core
Expand Down

0 comments on commit 68167b5

Please sign in to comment.