Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit ebce5b7

Browse files
authored
Update packages for CVE-2022-24407 (#209)
1 parent a3becb8 commit ebce5b7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ jobs:
189189
continue-on-error: true
190190
with:
191191
image-ref: nginx/nginx-ingress-operator:${{ steps.meta.outputs.version }}
192-
format: 'template'
193-
template: '@/contrib/sarif.tpl'
192+
format: 'sarif'
194193
output: 'trivy-results.sarif'
195194
ignore-unfixed: 'true'
196195
- name: Upload Trivy scan results to GitHub Security tab

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ COPY controllers/ controllers/
1919
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.version=${VERSION}" -a -o manager main.go
2020

2121
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as base
22+
# temporary fix for CVE-2022-24407
23+
RUN microdnf --nodocs upgrade -y cyrus-sasl-lib
2224
ARG VERSION
2325
WORKDIR /
2426
COPY config/crd/kic ./config/crd/kic

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
118118

119119
.PHONY: docker-build
120120
docker-build: test ## Build docker image with the manager.
121-
docker build -t ${IMG} -f ${DOCKERFILE} . --build-arg VERSION=${VERSION} --target local
121+
docker build -t ${IMG} . --build-arg VERSION=${VERSION} --target local
122122

123123
.PHONY: docker-push
124124
docker-push: ## Push docker image with the manager.

0 commit comments

Comments
 (0)