From 587123e3c7b211986a3a77b4592c80760fea0422 Mon Sep 17 00:00:00 2001 From: Karol Stolarski Date: Fri, 30 Oct 2020 10:41:23 -0500 Subject: [PATCH 1/8] First commit --- .gitignore | 2 + Dockerfile | 31 ++++++++ Jenkinsfile | 2 + LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 38 ++++++++++ README.md | 2 +- download.yaml | 6 ++ 7 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 download.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2b3d20b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +history.txt +Dockerfile.* \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..49d95a4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,31 @@ +# Build the intermediate container +ARG BASE_REGISTRY=registry1.dsop.io/ironbank/redhat/ubi +ARG BASE_IMAGE=ubi8 +ARG BASE_TAG=8.2 +FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c AS base +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + +# Label +LABEL org.opencontainers.image.title="admission-webhook" \ + org.opencontainers.image.description="admission-webhook v20190520-v0-139-gcee39dbc-dirty-0d8f4c container based off UBI 8" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.url="gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0" \ + org.opencontainers.image.version="v20190520-v0-139-gcee39dbc-dirty-0d8f4c" \ + maintainer="karol.stolarski@annoai.com" +ENV LANG C.UTF-8 + +RUN mkdir -p /app +COPY --from=base /webhook /app + +RUN dnf upgrade -y && \ + dnf clean all && \ + rm -rf /var/cache/dnf +RUN groupadd -r kf && useradd -r -g kf kf +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 chown -R kf /app +USER kf +WORKDIR /app + +ENTRYPOINT [ "./webhook" ] +HEALTHCHECK CMD ps | grep webhook | grep -v grep \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..fb380f6 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: 'v20190520-v0-139-gcee39dbc-dirty-0d8f4c') diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + 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 + boilerplate notice, with the fields enclosed by brackets "[]" + 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. + + Copyright [yyyy] [name of copyright owner] + + 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 + limitations under the License. \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..7c4abd1 --- /dev/null +++ b/Makefile @@ -0,0 +1,38 @@ +.PHONY: history + +ORIGINAL=gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0 +HARDENED=admission-webhook-hardened + +run-original: + docker run --rm \ + ${ORIGINAL} + /bin/bash + +run-original-it: + docker run -it \ + ${ORIGINAL} \ + /bin/bash + +history: + docker history --format "{{.CreatedBy}}" \ + ${ORIGINAL} \ + --no-trunc | tac | tee history.txt + +build: + 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} + +run-it: + docker run -it --rm \ + ${HARDENED} /bin/bash \ No newline at end of file diff --git a/README.md b/README.md index 828367a..0820894 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# admission-webhook +# admission-webhook-v20190520-v0-139-gcee39dbc-dirty-0d8f4c diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..415c6bd --- /dev/null +++ b/download.yaml @@ -0,0 +1,6 @@ +--- +resources: + - url: "docker://gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0" + tag: "kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c" + + -- GitLab From 498ae17db7402c251e7d0c55285ac27f826222c7 Mon Sep 17 00:00:00 2001 From: Karol Stolarski Date: Tue, 10 Nov 2020 13:58:04 -0600 Subject: [PATCH 2/8] Updated to 8.3 --- Dockerfile | 2 +- Makefile | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49d95a4..37248f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Build the intermediate container ARG BASE_REGISTRY=registry1.dsop.io/ironbank/redhat/ubi ARG BASE_IMAGE=ubi8 -ARG BASE_TAG=8.2 +ARG BASE_TAG=8.3 FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Makefile b/Makefile index 7c4abd1..2b2a1b7 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,11 @@ history: ${ORIGINAL} \ --no-trunc | tac | tee history.txt -build: +pull: + docker pull gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0 + docker tag gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0 kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c + +build: pull docker build --no-cache \ --build-arg BASE_REGISTRY="registry.access.redhat.com" \ -t ${HARDENED} . @@ -35,4 +39,6 @@ run: run-it: docker run -it --rm \ - ${HARDENED} /bin/bash \ No newline at end of file + ${HARDENED} /bin/bash + +all: pull fast run \ No newline at end of file -- GitLab From 90418cc3aee3639dc70a66685b73f75c5a9b6bcd Mon Sep 17 00:00:00 2001 From: cvernooy Date: Wed, 9 Dec 2020 16:15:36 +0000 Subject: [PATCH 3/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb380f6..a7026f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: 'v20190520-v0-139-gcee39dbc-dirty-0d8f4c') +dccscrPipeline(version: '82f41fd8878e') -- GitLab From 874ed491ae622703001e6b5ffea58892e14d2dfb Mon Sep 17 00:00:00 2001 From: cvernooy Date: Wed, 9 Dec 2020 17:50:21 +0000 Subject: [PATCH 4/8] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 0820894..b5c3054 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ # admission-webhook-v20190520-v0-139-gcee39dbc-dirty-0d8f4c +Deployment +The Anno AI team has a workflow setup in ArgoCD to deploy this container, as well as all other containers for Kubeflow. As such, no Helm chart or Kubernetes manifests will be created to aid in deployment. This container is a drop in replacement for the open source container. Kubeflow deployment instructions + +Version +This code is based off of the "v20190520-v0-139-gcee39dbc-dirty-0d8f4c" upstream container because of the requirement of this image for Kubeflow 1.0.2 -- GitLab From 9b923397e460d43e227b945864389dcea0e08125 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:28:18 +0000 Subject: [PATCH 5/8] Migrate to hardening_manifest.yaml --- Dockerfile | 6 ----- Jenkinsfile | 2 -- download.yaml | 6 ----- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 14 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 37248f8..d1cdd13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,6 @@ FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} # Label -LABEL org.opencontainers.image.title="admission-webhook" \ - org.opencontainers.image.description="admission-webhook v20190520-v0-139-gcee39dbc-dirty-0d8f4c container based off UBI 8" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0" \ - org.opencontainers.image.version="v20190520-v0-139-gcee39dbc-dirty-0d8f4c" \ - maintainer="karol.stolarski@annoai.com" ENV LANG C.UTF-8 RUN mkdir -p /app diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index a7026f5..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: '82f41fd8878e') diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 415c6bd..0000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -resources: - - url: "docker://gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0" - tag: "kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c" - - diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..ec2dfff --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "kubeflow/admission-webhook/admission-webhook-82f41fd8878e" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "82f41fd8878e" +- "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: "admission-webhook-82f41fd8878e" + ## Human-readable description of the software packaged in the image + # org.opencontainers.image.description: "FIXME" + ## License(s) under which contained software is distributed + # org.opencontainers.image.licenses: "FIXME" + ## URL to find more information on the image + # org.opencontainers.image.url: "FIXME" + ## Name of the distributing entity, organization or individual + # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.version: "82f41fd8878e" + ## Keywords to help with search (ex. "cicd,gitops,golang") + # mil.dso.ironbank.image.keywords: "FIXME" + ## This value can be "opensource" or "commercial" + # mil.dso.ironbank.image.type: "FIXME" + ## Product the image belongs to for grouping multiple images + # mil.dso.ironbank.product.name: "FIXME" + +# List of resources to make available to the offline build context +resources: +- tag: kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c + url: docker://gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0 + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "cvernooy@oteemo.com" +# # The name of the current container owner +# name: "FIXME" +# # The gitlab username of the current container owner +# username: "FIXME" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +# - name: "FIXME" +# username: "FIXME" +# email: "FIXME" -- GitLab From cb6c53967c51cc7ece88f1c2724d1d81b5f4e069 Mon Sep 17 00:00:00 2001 From: cvernooy Date: Fri, 11 Dec 2020 14:53:06 +0000 Subject: [PATCH 6/8] Update hardening_manifest.yaml, Dockerfile files --- Dockerfile | 5 ----- hardening_manifest.yaml | 41 +++++++++++------------------------------ 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1cdd13..9dac925 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,10 @@ ARG BASE_IMAGE=ubi8 ARG BASE_TAG=8.3 FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} - # Label ENV LANG C.UTF-8 - RUN mkdir -p /app COPY --from=base /webhook /app - RUN dnf upgrade -y && \ dnf clean all && \ rm -rf /var/cache/dnf @@ -20,6 +17,4 @@ RUN find / -path /proc -prune -o -perm /2000 -exec chmod g-s {} \; RUN chown -R kf /app USER kf WORKDIR /app - ENTRYPOINT [ "./webhook" ] -HEALTHCHECK CMD ps | grep webhook | grep -v grep \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index ec2dfff..ba00538 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -3,10 +3,6 @@ apiVersion: v1 # The repository name in registry1, excluding /ironbank/ name: "kubeflow/admission-webhook/admission-webhook-82f41fd8878e" - -# List of tags to push for the repository in registry1 -# The most specific version should be the first tag and will be shown -# on ironbank.dsop.io tags: - "82f41fd8878e" - "latest" @@ -19,37 +15,22 @@ args: # Docker image labels labels: org.opencontainers.image.title: "admission-webhook-82f41fd8878e" - ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" - ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" - ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" - ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.description: "admission-webhook container for kubeflow 1.0.2 based on UBI 8 baase imaage" + org.opencontainers.image.licenses: "Apache-2.0" + org.opencontainers.image.url: "gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0" + org.opencontainers.image.vendor: "kubeflow" org.opencontainers.image.version: "82f41fd8878e" - ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" - ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" - ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.image.keywords: "kubeflow,admission-webhook," + 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: kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c url: docker://gcr.io/kubeflow-images-public/admission-webhook@sha256:82f41fd8878ead19616b577c537d2ff83ea576b78478b2f8819caa83eeac0ee0 -# List of project maintainers -# FIXME: Fill in the following details for the current container owner in the whitelist -# FIXME: Include any other vendor information if applicable maintainers: - email: "cvernooy@oteemo.com" -# # The name of the current container owner -# name: "FIXME" -# # The gitlab username of the current container owner -# username: "FIXME" -# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT -# - name: "FIXME" -# username: "FIXME" -# email: "FIXME" + name: "Christopher Vernooy" + username: "cvernooy" + cht_member: true + -- GitLab From 77002fd67fec74417ad10194a8fa68b4f72d6b64 Mon Sep 17 00:00:00 2001 From: Karol Stolarski Date: Thu, 7 Jan 2021 14:25:44 -0600 Subject: [PATCH 7/8] Removed label comment --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9dac925..4336c79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,6 @@ ARG BASE_IMAGE=ubi8 ARG BASE_TAG=8.3 FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -# Label -ENV LANG C.UTF-8 RUN mkdir -p /app COPY --from=base /webhook /app RUN dnf upgrade -y && \ -- GitLab From 8b6910a6c3deb399732afa84627ef0a57c2ba721 Mon Sep 17 00:00:00 2001 From: Michael Simmons Date: Wed, 14 Apr 2021 12:26:04 -0600 Subject: [PATCH 8/8] Added Healthcheck --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4336c79..6ed3dc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Build the intermediate container -ARG BASE_REGISTRY=registry1.dsop.io/ironbank/redhat/ubi -ARG BASE_IMAGE=ubi8 +ARG BASE_REGISTRY=registry1.dso.mil +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -15,4 +15,5 @@ RUN find / -path /proc -prune -o -perm /2000 -exec chmod g-s {} \; RUN chown -R kf /app USER kf WORKDIR /app +HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "curl -sL -w "%{http_code}\n" https://127.0.0.1:4443 -o /dev/null" ] ENTRYPOINT [ "./webhook" ] -- GitLab