Skip to content

Commit

Permalink
Merge pull request #82 from waja/dependabot-github_actions-github-sup…
Browse files Browse the repository at this point in the history
…er-linter-7

Bump github/super-linter from 6 to 7
  • Loading branch information
waja authored Aug 31, 2024
2 parents 538d5fb + 3600761 commit b63d5c4
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .github/linters/.jscpd.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"threshold": 4,
"ignore": [
"**/.github/workflows/docker.image.yml"
]
"ignore": ["**/.github/workflows/docker.image.yml"]
}
31 changes: 15 additions & 16 deletions .github/workflows/docker.image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:
- development
- master
tags:
- '*.*.*-*'
- "*.*.*-*"
# Run tests for any PRs
pull_request:
schedule:
- cron: '43 10 * * 4'
- cron: "43 10 * * 4"

env:
IMAGE_NAME: speedtest
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
# list of files that changed across commits
fetch-depth: 0
- name: Lint Code Base
uses: github/super-linter@v6
uses: github/super-linter@v7
env:
DEFAULT_BRANCH: master
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -168,17 +168,17 @@ jobs:
- name: Run dockle container image linter
uses: goodwithtech/[email protected]
with:
image: 'registry:5000/foobar/${{ env.IMAGE_NAME }}'
image: "registry:5000/foobar/${{ env.IMAGE_NAME }}"
insecure: true
format: 'sarif'
exit-code: '1'
exit-level: 'warn'
ignore: 'CIS-DI-0001,CIS-DI-0010,DKL-DI-0006'
format: "sarif"
exit-code: "1"
exit-level: "warn"
ignore: "CIS-DI-0001,CIS-DI-0010,DKL-DI-0006"
output: sarif-reports
- name: Upload Reports
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'sarif-reports'
sarif_file: "sarif-reports"
trivy:
name: Run Trivy tests
needs:
Expand Down Expand Up @@ -206,14 +206,14 @@ jobs:
uses: aquasecurity/trivy-action@master
with:
image-ref: localhost:5000/foobar/${{ env.IMAGE_NAME }}
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results.sarif'
severity: 'CRITICAL,HIGH'
format: "template"
template: "@/contrib/sarif.tpl"
output: "trivy-results.sarif"
severity: "CRITICAL,HIGH"
- name: Upload Reports
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'
sarif_file: "trivy-results.sarif"
anchore:
name: Run Anchore tests
needs:
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
- name: Upload Reports
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'sarif-reports'
sarif_file: "sarif-reports"
release-docker:
name: Release Docker images
needs:
Expand Down Expand Up @@ -418,4 +418,3 @@ jobs:
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!-- markdownlint-disable MD045 -->

# Docker-Speedtest

[![](https://images.microbadger.com/badges/version/waja/speedtest.svg)](https://hub.docker.com/r/waja/speedtest/)
Expand All @@ -14,7 +15,7 @@ Builds a docker image with the [speedtest-cli](https://github.com/sivel/speedtes

Pulled from [https://github.com/tianon/dockerfiles/tree/master/speedtest](https://github.com/tianon/dockerfiles/tree/master/speedtest)

Ever wanted to speedtest a server, but didn't want to do funky tunnelling so you could hit up good ol' speedtest.net? WORRY NO MORE.
Ever wanted to speedtest a server, but didn't want to do funky tunnelling so you could hit up good ol' speedtest.net? WORRY NO MORE.

# Running

Expand Down

0 comments on commit b63d5c4

Please sign in to comment.