diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b9563e7cd4f6685114071748e9221d06f1e21f8d --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +Dockerfile.* +history.txt +tini diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..34d3df69cfd776a61114c0558254933ca9b5d2dd --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +ARG BASE_REGISTRY=registry1.dsop.io/ironbank/redhat/ubi +ARG BASE_IMAGE=ubi8 +ARG BASE_TAG=8.3 +FROM spark-operator/spark-operator:v1beta2-1.0.0-2.4.4 AS base +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +RUN dnf upgrade -y +RUN dnf install -y openssl curl +RUN rm -rf /var/cache/dnf +COPY --from=base /usr/bin/spark-operator /usr/bin/ +COPY tini /sbin/ +RUN chmod +x /sbin/tini +COPY --from=base /usr/bin/gencerts.sh /usr/bin/ +RUN chmod +x /usr/bin/gencerts.sh +COPY --from=base /usr/bin/entrypoint.sh /usr/bin/ +RUN chmod +x /usr/bin/entrypoint.sh +RUN find / -path /proc -prune -o -perm /4000 -exec chmod u-s {} \; +RUN find / -path /proc -prune -o -perm /2000 -exec chmod g-s {} \; +RUN groupadd -r spark-operator && useradd -r -g spark-operator spark-operator +RUN chown -R spark-operator /usr/bin +USER spark-operator +ENTRYPOINT ["/usr/bin/entrypoint.sh"] \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..a2537d9d9e9af41d068040bc4b912a52ffac1523 --- /dev/null +++ b/LICENSE @@ -0,0 +1,213 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following +<<<<<<< HEAD + boilerplate notice, with the fields enclosed by brackets "[]" +======= + boilerplate notice, with the fields enclosed by brackets "{}" +>>>>>>> binary-testing + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +<<<<<<< HEAD + Copyright [yyyy] [name of copyright owner] +======= + Copyright 2020 Ironbank Containers / Kubeflow / metadata / watcher +>>>>>>> binary-testing + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and +<<<<<<< HEAD + limitations under the License. +======= + limitations under the License. +>>>>>>> binary-testing diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..f801b4f06e5d42068de9e077e13130872769ce21 --- /dev/null +++ b/Makefile @@ -0,0 +1,54 @@ +.PHONY: history + +ORIGINAL=gcr.io/spark-operator/spark-operator@sha256:52b257911a5c47c480aae25f83c80151a2ed8c99e8b50317d451c157c80666fd +TAGGED=spark-operator/spark-operator:v1beta2-1.0.0-2.4.4 +HARDENED=spark-operator-v1beta2-1.0.0-2.4.4:hardened + +pull: + docker pull ${ORIGINAL} + docker tag ${ORIGINAL} ${TAGGED} + +run-original: + docker run --rm \ + --name original \ + ${TAGGED} + +shell-original: + docker run -it \ + --name original-interactive \ + ${TAGGED} \ + /bin/bash + +history: + docker history --format "{{.CreatedBy}}" \ + ${TAGGED} \ + --no-trunc | tac | tee history.txt + +build: pull + docker build --no-cache \ + --build-arg BASE_REGISTRY="registry.access.redhat.com" \ + -t ${HARDENED} . + +# Build fast +fast: + docker build \ + --build-arg BASE_REGISTRY="registry.access.redhat.com" \ + -t ${HARDENED} . + +run: + docker run --rm \ + ${HARDENED} + +shell: + docker run -it --rm \ + ${HARDENED} \ + /bin/bash + +copy-root: + docker cp original-interactive:/ files + +clean: + docker stop original original-interactive ${HARDENED} + docker rm original original-interactive ${HARDENED} + +all: pull fast run \ No newline at end of file diff --git a/README.md b/README.md index 2f4e48ba635ac49efe591c0fb847438d0c401f28..40ee2a5531986718eba0fef81f27dc9aa621f2f6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ -# Spark Operator V1beta2 1.0.0 +# spark-operator-v1beta2-1.0.0-2.4.4 +This is a hardened version of the upstream spark-operator/spark-operator:v1beta2-1.0.0-2.4.4 image. This is NOT meant to be deployed as is, rather imported and usesd as a base container. An example of some containers that will rely on this are the jupyter notebook containers as well as some others for the Kubeflow deployment. +No chart or deployment instructions will be made available for this image unless there is a need to deploy this container as-is +To test, run `make build` then `make run`. + +To compare to unhardened container, run `make run-original` diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2f4022275f027be91b14be1a0c183c70add631ca --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,42 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "spark-operator/spark-operator" + +tags: +- "v1beta2-1.0.0-2.4.4" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "redhat/ubi/ubi8" + BASE_TAG: "8.3" + +# Docker image labels +labels: + org.opencontainers.image.title: "Spark Operator V1beta2 1.0.0" + org.opencontainers.image.description: "spark-operator component for v1beta2-1.0.0-2.4.4 based on UBI 8" + org.opencontainers.image.licenses: "Apache-2.0" + org.opencontainers.image.url: "gcr.io/spark-operator/spark-operator@sha256:52b257911a5c47c480aae25f83c80151a2ed8c99e8b50317d451c157c80666fd" + org.opencontainers.image.vendor: "spark-operator" + org.opencontainers.image.version: "v1beta2-1.0.0-2.4.4" + mil.dso.ironbank.image.keywords: "spark,spark-operator,v1beta2-1.0.0-2.4.4" + mil.dso.ironbank.image.type: "opensource" + mil.dso.ironbank.product.name: "kubeflow" + +# List of resources to make available to the offline build context +resources: + - tag: spark-operator/spark-operator:v1beta2-1.0.0-2.4.4 + url: docker://gcr.io/spark-operator/spark-operator@sha256:52b257911a5c47c480aae25f83c80151a2ed8c99e8b50317d451c157c80666fd + - url: "https://github.com/krallin/tini/releases/download/v0.18.0/tini-amd64" + filename: tini + validation: + type: sha256 + value: "12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855" + +maintainers: +- email: "cvernooy@oteemo.com" + name: "Christopher Vernooy" + username: "cvernooy" + cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT