Skip to content

openshift comply #220

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 7, 2019
Merged

openshift comply #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecbc063
openshift comply
hendolim Aug 6, 2019
236fb85
update splunk version
hendolim Aug 7, 2019
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
17 changes: 15 additions & 2 deletions base/redhat-8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# NOTE that since OpenShift Container Platform 3.11
# the container catalog moved from registry.access.redhat.com to registry.redhat.io
# So at some point before they deprecate the old registry we have to make sure that
# we have access to the new registry and change where we pull the ubi image from.
Copy link
Contributor

@mikedickey mikedickey Aug 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please your provide reference for this, since all the docs for UBI images seem to reference registry.access.redhat.com, and these were published concurrent with the release of 4.0, which is long after 3.11 was released.

FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL maintainer="support@splunk.com"
LABEL name="splunk" \
maintainer="support@splunk.com" \
vendor="splunk" \
version="7.3.1" \
Copy link
Contributor

@bb03 bb03 Aug 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine to hardcode for now, but in the future we should update this to be whatever the splunk version is from our Makefile

release="1" \
summary="UBI 8 Docker image of Splunk Enterprise" \
description="Splunk Enterprise is a platform for operational intelligence. Our software lets you collect, analyze, and act upon the untapped value of big data that your technology infrastructure, security systems, and business applications generate. It gives you insights to drive operational performance and business results."

RUN mkdir /licenses; \
Copy link
Contributor

@mikedickey mikedickey Aug 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably combine this with the RUN command below, so that we are not unnecessarily creating an additional image layer.

curl -o /licenses/apache-2.0.txt https://www.apache.org/licenses/LICENSE-2.0.txt; \
curl -o /licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf

COPY install.sh /install.sh
COPY EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf /EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
RUN /install.sh && rm -rf /install.sh
Binary file removed base/redhat-8/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
View file
Open in desktop
Binary file not shown.