Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix notification and add alpine-opentracing #2406

Merged
merged 1 commit into from
Feb 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ jobs:
nginx/nginx-ingress
ghcr.io/nginxinc/kubernetes-ingress
public.ecr.aws/nginx/nginx-ingress
flavor: suffix=${{ matrix.image == 'ubi' && '-ubi' || '' }}${{ contains(matrix.image, 'alpine') && '-alpine' || '' }}${{ contains(matrix.image, 'opentracing') && '-ot' || '' }},onlatest=true
flavor: suffix=${{ contains(matrix.image, 'ubi') && '-ubi' || '' }}${{ contains(matrix.image, 'alpine') && '-alpine' || '' }}${{ contains(matrix.image, 'opentracing') && '-ot' || '' }},onlatest=true
tags: |
type=edge
type=ref,event=pr
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/update-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,17 @@ jobs:
marker: vsr
platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
needs-updating: ${{ needs.check.outputs.needs-updating-alpine }}
- image: alpine-opentracing
marker: policies
platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
needs-updating: ${{ needs.check.outputs.needs-updating-alpine }}
- image: opentracing
marker: vs
platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
needs-updating: ${{ needs.check.outputs.needs-updating-debian }}
- image: ubi
marker: ts
platforms: linux/arm64,linux/amd64
platforms: linux/arm64,linux/amd64,linux/s390x
needs-updating: ${{ needs.check.outputs.needs-updating-ubi }}
steps:
- name: Checkout Repository
Expand Down Expand Up @@ -217,7 +221,7 @@ jobs:
public.ecr.aws/nginx/nginx-ingress
flavor: |
latest=true
suffix=${{ matrix.image != 'debian' && '-' || '' }}${{ matrix.image != 'debian' && matrix.image != 'opentracing' && matrix.image || '' }}${{ matrix.image == 'opentracing' && 'ot' || '' }},onlatest=true
suffix=${{ contains(matrix.image, 'ubi') && '-ubi' || '' }}${{ contains(matrix.image, 'alpine') && '-alpine' || '' }}${{ contains(matrix.image, 'opentracing') && '-ot' || '' }},onlatest=true
tags: |
type=raw,value=${{ needs.variables.outputs.kic-tag }}
type=raw,value=${{ steps.tag.outputs.short }}
Expand Down Expand Up @@ -249,7 +253,7 @@ jobs:
uses: aquasecurity/[email protected]
continue-on-error: true
with:
image-ref: nginx/nginx-ingress:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
image-ref: nginx/nginx-ingress:${{ steps.meta.outputs.version }}
format: 'template'
template: '@/contrib/sarif.tpl'
output: 'trivy-results-${{ matrix.image }}.sarif'
Expand Down Expand Up @@ -287,7 +291,7 @@ jobs:
color: "good",
fields: [{
title: "Docker Image",
value: "<https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=${{ needs.variables.outputs.kic-tag }}|nginx/nginx-ingress:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}>",
value: `<https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=${{ needs.variables.outputs.kic-tag }}|nginx/nginx-ingress:${{ steps.meta.outputs.version }}>`,
short: true
},
{
Expand All @@ -297,7 +301,7 @@ jobs:
},
{
title: "Commit Message",
value: "${{ steps.slack.outputs.message }}",
value: `${{ steps.slack.outputs.message }}`,
short: true
},
{
Expand Down