Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openshift/cac-content-fork
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aa768133270844acdff00e66682c11cb2d6c0091
Choose a base ref
..
head repository: openshift/cac-content-fork
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f71341d1c926c134196fb8fa37f7cf8cf0c3239
Choose a head ref
Showing with 4 additions and 6 deletions.
  1. +4 −6 Dockerfiles/compliance-operator-content-konflux.Containerfile
10 changes: 4 additions & 6 deletions Dockerfiles/compliance-operator-content-konflux.Containerfile
Original file line number Diff line number Diff line change
@@ -3,16 +3,14 @@ FROM registry.redhat.io/ubi9/ubi:latest AS builder
RUN yum -y update
RUN yum -y install wget
WORKDIR /tmp
RUN wget http://download.eng.bos.redhat.com/brewroot/packages/openscap/1.3.4/4.el9/data/signed/fd431d51/$(uname -m)/openscap-1.3.4-4.el9.$(uname -m).rpm
RUN wget http://download.eng.bos.redhat.com/brewroot/packages/openscap/1.3.4/4.el9/data/signed/fd431d51/$(uname -m)/openscap-utils-1.3.4-4.el9.$(uname -m).rpm
RUN wget http://download.eng.bos.redhat.com/brewroot/packages/openscap/1.3.4/4.el9/data/signed/fd431d51/$(uname -m)/openscap-scanner-1.3.4-4.el9.$(uname -m).rpm
RUN yum -y install python3 cmake make python3-pyyaml python3-jinja2
RUN yum localinstall -y openscap-1.3.4-4.el9.$(uname -m).rpm openscap-utils-1.3.4-4.el9.$(uname -m).rpm openscap-scanner-1.3.4-4.el9.$(uname -m).rpm
RUN yum -y install python3 cmake make python3-pyyaml python3-jinja2 openscap openscap-utils openscap-scanner

COPY . .

WORKDIR /go/src/github.com/openshift/cac-content-fork

COPY . .

# Disable all profiles so we don't accidentally ship a profile we don't intend to ship
RUN find . -name "*.profile" -exec sed -i 's/\(documentation_complete: \).*/\1false/' '{}' \;
# Enable the default.profiles as they maintain a list rules to be added to the datastream
@@ -99,4 +97,4 @@ LABEL \
# version=1.6.1-dev

WORKDIR /
COPY --from=builder /tmp/content/build/ssg-*-ds.xml .
COPY --from=builder /go/src/github.com/openshift/cac-content-fork/build/ssg-*-ds.xml .