Skip to content

Commit df960f1

Browse files
authored
Fix image security issue / adjust certification check (#886)
update base image version and adjust preflight check
1 parent 5755aa9 commit df960f1

File tree

4 files changed

+4
-17
lines changed

4 files changed

+4
-17
lines changed

.github/actions/certify-openshift-images/action.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ inputs:
1616
rhcc_project:
1717
description: The Redhat certification central project id
1818
required: true
19-
submit:
20-
description: Submit result to RedHat Connect
21-
required: false
22-
default: "false"
2319
runs:
2420
using: 'docker'
2521
image: 'Dockerfile'
@@ -28,5 +24,4 @@ runs:
2824
VERSION: ${{ inputs.version }}
2925
QUAY_PASSWORD: ${{ inputs.quay_password }}
3026
RHCC_TOKEN: ${{ inputs.rhcc_token }}
31-
RHCC_PROJECT: ${{ inputs.rhcc_project }}
32-
SUBMIT: ${{ inputs.submit }}
27+
RHCC_PROJECT: ${{ inputs.rhcc_project }}

.github/actions/certify-openshift-images/entrypoint.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,12 @@ docker login -u mongodb+mongodb_atlas_kubernetes -p "${QUAY_PASSWORD}" quay.io
77
DIGESTS=$(docker manifest inspect "${REPOSITORY}:${VERSION}" | jq -r .manifests[].digest)
88

99
for DIGEST in $DIGESTS; do
10-
echo "Checking image $DIGEST"
11-
# Do the preflight check first
12-
preflight check container "${REPOSITORY}:${VERSION}@${DIGEST}" --artifacts "${DIGEST}" --docker-config="${HOME}/.docker/config.json"
13-
14-
if [ "$SUBMIT" = "true" ]; then
15-
rm -rf "${DIGEST}"
16-
echo "Submitting result to RedHat Connect"
10+
echo "Check and Submit result to RedHat Connect"
1711
# Send results to RedHat if preflight finished wthout errors
18-
preflight check container "${REPOSITORY}@${DIGEST}" \
12+
preflight check container "quay.io/${REPOSITORY}@${DIGEST}" \
1913
--artifacts "${DIGEST}" \
2014
--pyxis-api-token="${RHCC_TOKEN}" \
2115
--certification-project-id="${RHCC_PROJECT}" \
2216
--docker-config="${HOME}/.docker/config.json" \
2317
--submit
24-
fi
2518
done

.github/workflows/release-openshift.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
quay_password: ${{ secrets.QUAY_PASSWORD }}
6363
rhcc_token: ${{ secrets.RH_CERTIFICATION_PYXIS_API_TOKEN }}
6464
rhcc_project: ${{ secrets.RH_CERTIFICATION_OSPID }}
65-
submit: "true"
6665
- name: Configure certified release
6766
if: ${{ matrix.certified }}
6867
env:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ENV TARGET_OS=${TARGETOS}
2727

2828
RUN make manager
2929

30-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
30+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
3131

3232
RUN microdnf install yum &&\
3333
yum -y update &&\

0 commit comments

Comments
 (0)