From 2a4c3e995eec94c19af5f85214a5daf3ffd34fdd Mon Sep 17 00:00:00 2001 From: Joshua Eason Date: Mon, 26 Oct 2020 14:38:45 +0000 Subject: [PATCH 01/13] Removing CC lines in issue templates --- .gitlab/issue_templates/Application - Archive.md | 3 +-- .gitlab/issue_templates/Application - Initial.md | 3 +-- .gitlab/issue_templates/Application - Update.md | 3 +-- .gitlab/issue_templates/Bug.md | 3 +-- .gitlab/issue_templates/Feature Request.md | 3 +-- .gitlab/issue_templates/New Findings.md | 3 +-- .gitlab/issue_templates/Pipeline Failure.md | 3 +-- README.md | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitlab/issue_templates/Application - Archive.md b/.gitlab/issue_templates/Application - Archive.md index 9f3b5fe..a558faa 100644 --- a/.gitlab/issue_templates/Application - Archive.md +++ b/.gitlab/issue_templates/Application - Archive.md @@ -17,5 +17,4 @@ Requesting this application be archived due to one of the following reasons: - [ ] Iron Bank frontend no longer lists application as available or approved -/label ~"Container::Archive" -/cc @ironbank-notifications/archive \ No newline at end of file +/label ~"Container::Archive" \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md index 6594a05..b7acebd 100644 --- a/.gitlab/issue_templates/Application - Initial.md +++ b/.gitlab/issue_templates/Application - Initial.md @@ -28,5 +28,4 @@ Approval Process (container hardening team processes): -/label ~"Container::Initial" -/cc @ironbank-notifications/cht \ No newline at end of file +/label ~"Container::Initial" \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md index caebb3e..d95cb35 100644 --- a/.gitlab/issue_templates/Application - Update.md +++ b/.gitlab/issue_templates/Application - Update.md @@ -31,5 +31,4 @@ Approval Process: -/label ~"Container::Update" -/cc @ironbank-notifications/updates \ No newline at end of file +/label ~"Container::Update" \ No newline at end of file diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 1427a0c..2030c24 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -33,5 +33,4 @@ logs, and code as it's very hard to read otherwise.) - [ ] Bug has been identified and corrected within the container -/label ~Bug -/cc @ironbank-notifications/bug \ No newline at end of file +/label ~Bug \ No newline at end of file diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md index a0e2f19..94aea9a 100644 --- a/.gitlab/issue_templates/Feature Request.md +++ b/.gitlab/issue_templates/Feature Request.md @@ -28,5 +28,4 @@ - [ ] Feature has been implemented -/label ~Feature -/cc @ironbank-notifications/feature \ No newline at end of file +/label ~Feature \ No newline at end of file diff --git a/.gitlab/issue_templates/New Findings.md b/.gitlab/issue_templates/New Findings.md index 068d029..1fd613d 100644 --- a/.gitlab/issue_templates/New Findings.md +++ b/.gitlab/issue_templates/New Findings.md @@ -16,5 +16,4 @@ Approval Process: -/label ~"Container::New Findings" -/cc @ironbank-notifications/security \ No newline at end of file +/label ~"Container::New Findings" \ No newline at end of file diff --git a/.gitlab/issue_templates/Pipeline Failure.md b/.gitlab/issue_templates/Pipeline Failure.md index 28b82a9..dd6ab98 100644 --- a/.gitlab/issue_templates/Pipeline Failure.md +++ b/.gitlab/issue_templates/Pipeline Failure.md @@ -27,5 +27,4 @@ - [ ] Pipeline failure has been resolved -/label ~Pipeline -/cc @ironbank-notifications/pipelines \ No newline at end of file +/label ~Pipeline \ No newline at end of file diff --git a/README.md b/README.md index f2a2b88..5dc6fa6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# master-project-template +# Project template for all Iron Bank container repositories. \ No newline at end of file -- GitLab From fb4c993c0c29da108d218f708cc200aa95af9514 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 26 Oct 2020 15:35:38 +0000 Subject: [PATCH 02/13] Update Application - Update.md --- .gitlab/issue_templates/Application - Update.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md index d95cb35..15567be 100644 --- a/.gitlab/issue_templates/Application - Update.md +++ b/.gitlab/issue_templates/Application - Update.md @@ -19,6 +19,9 @@ Hardening: - [ ] Container version has been updated in greylist file - [ ] Branch has been merged into `development` +No new findings: +- [ ] There are no new findings in this update. Skip the Justifications and Approval Process steps and apply the label ~"Approval". + Justifications: - [ ] All findings have been justified per the above documentation - [ ] Justifications have been provided to the container hardening team -- GitLab From 7011746bc70031305d0eff244132d96b995862b7 Mon Sep 17 00:00:00 2001 From: bhearn Date: Mon, 2 Nov 2020 15:37:30 -0700 Subject: [PATCH 03/13] initial commit --- Dockerfile | 34 +++++++++ LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 22 +++++- download.yaml | 4 + 4 files changed, 259 insertions(+), 2 deletions(-) create mode 100644 Dockerfile create mode 100644 LICENSE create mode 100644 download.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9fce988 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=ironbank/google/golang/golang-1.14 +ARG BASE_TAG=1.14.4 + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder + +LABEL name="Thanos" \ + maintainer="bhearn@anchore.com" \ + vendor="Opensource" \ + version="v0.16.0" \ + release="1" \ + summary="Image of Thanos" \ + description="Thanos is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments." + +WORKDIR $GOPATH/src/github.com/thanos-io/thanos + +USER 0 + +RUN dnf upgrade -y && \ + dnf install -y git make --setopt=tsflags=nodocs && \ + dnf clean all && \ + rm -rf /var/cache/dnf + +RUN git clone https://github.com/thanos-io/thanos.git && \ + cd thanos && \ + git update-index --refresh; make build + +FROM quay.io/prometheus/busybox:latest + +COPY --from=builder /go/bin/thanos /bin/thanos + +ENTRYPOINT [ "/bin/thanos" ] + +HEALTHCHECK NONE \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9c8f3ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + 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/README.md b/README.md index 5dc6fa6..d21b47a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ -# +# Thanos -Project template for all Iron Bank container repositories. \ No newline at end of file +[Thanos](https://thanos.io/) is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments. + +**Requirements:** +- Prometheus v2.2.1+ installed + +## Download + +1. Visit to the opensource webpage in [Iron Bank](https://ironbank.dsop.io/ironbank/repomap/opensource) and download the Thanos tarball. + +2. Navigate to the location of the download and run the following command to load the image: +``` +docker load -i +``` + +## Install + +There are several ways to configure and deploy Thanos. Please see the Thanos docs: +- [Deploying Thanos](https://thanos.io/tip/thanos/getting-started.md/#deploying-thanos) +- [Quick Tutorial](https://thanos.io/tip/thanos/quick-tutorial.md/) \ No newline at end of file diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..f46203d --- /dev/null +++ b/download.yaml @@ -0,0 +1,4 @@ +--- +resources: + - url: docker://quay.io/prometheus/busybox@sha256:64db0ecb0d989773dea64212d366e618c29a5552e3e386ac1dd603bf770f484e + tag: prometheus/busybox:latest \ No newline at end of file -- GitLab From 67f0e95eff294e8067231facf14a438114f00cd8 Mon Sep 17 00:00:00 2001 From: bhearn Date: Mon, 2 Nov 2020 15:39:31 -0700 Subject: [PATCH 04/13] update version --- download.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/download.yaml b/download.yaml index f46203d..629da4a 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,5 @@ --- +version: v0.16.0 resources: - url: docker://quay.io/prometheus/busybox@sha256:64db0ecb0d989773dea64212d366e618c29a5552e3e386ac1dd603bf770f484e tag: prometheus/busybox:latest \ No newline at end of file -- GitLab From e884bec8803a29107b1325f41514fc36a45b3706 Mon Sep 17 00:00:00 2001 From: bhearn Date: Wed, 4 Nov 2020 13:26:56 -0700 Subject: [PATCH 05/13] add source tar --- Dockerfile | 11 +++++------ download.yaml | 5 +++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fce988..d1044af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,18 +12,17 @@ LABEL name="Thanos" \ summary="Image of Thanos" \ description="Thanos is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments." +COPY thanos.tar.gz /opt + WORKDIR $GOPATH/src/github.com/thanos-io/thanos USER 0 RUN dnf upgrade -y && \ - dnf install -y git make --setopt=tsflags=nodocs && \ dnf clean all && \ - rm -rf /var/cache/dnf - -RUN git clone https://github.com/thanos-io/thanos.git && \ - cd thanos && \ - git update-index --refresh; make build + rm -rf /var/cache/dnf && \ + tar -zxf /opt/thanos.tar.gz --strip-components=1 -C /go/bin/ && \ + rm -f /opt/thanos.tar.gz FROM quay.io/prometheus/busybox:latest diff --git a/download.yaml b/download.yaml index 629da4a..9ff08bb 100644 --- a/download.yaml +++ b/download.yaml @@ -1,5 +1,10 @@ --- version: v0.16.0 resources: + - url: https://github.com/thanos-io/thanos/releases/download/v0.16.0/thanos-0.16.0.linux-amd64.tar.gz + filename: thanos.tar.gz + validation: + type: "sha256" + value: "a05b141798d02deca8a4161848db333ddaea3463becafa80bb74a6e9fcb57c08" - url: docker://quay.io/prometheus/busybox@sha256:64db0ecb0d989773dea64212d366e618c29a5552e3e386ac1dd603bf770f484e tag: prometheus/busybox:latest \ No newline at end of file -- GitLab From ae025688a50f57ce9ee26a1c4e413a7dad59f4c1 Mon Sep 17 00:00:00 2001 From: bhearn Date: Wed, 4 Nov 2020 14:36:05 -0700 Subject: [PATCH 06/13] update quay path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1044af..65a2029 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN dnf upgrade -y && \ tar -zxf /opt/thanos.tar.gz --strip-components=1 -C /go/bin/ && \ rm -f /opt/thanos.tar.gz -FROM quay.io/prometheus/busybox:latest +FROM prometheus/busybox:latest COPY --from=builder /go/bin/thanos /bin/thanos -- GitLab From 41f4827811e4f3b540401cac588d41290cf846e6 Mon Sep 17 00:00:00 2001 From: bhearn Date: Mon, 16 Nov 2020 14:09:34 -0700 Subject: [PATCH 07/13] remove prom/busybox --- Dockerfile | 3 ++- download.yaml | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65a2029..649af6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ RUN dnf upgrade -y && \ tar -zxf /opt/thanos.tar.gz --strip-components=1 -C /go/bin/ && \ rm -f /opt/thanos.tar.gz -FROM prometheus/busybox:latest +# an approved UBI is used instead of an unapproved quay.io/prometheus/busybox +FROM registry1.dsop.io/ironbank/redhat/ubi/ubi8:8.3 COPY --from=builder /go/bin/thanos /bin/thanos diff --git a/download.yaml b/download.yaml index 9ff08bb..550246c 100644 --- a/download.yaml +++ b/download.yaml @@ -5,6 +5,4 @@ resources: filename: thanos.tar.gz validation: type: "sha256" - value: "a05b141798d02deca8a4161848db333ddaea3463becafa80bb74a6e9fcb57c08" - - url: docker://quay.io/prometheus/busybox@sha256:64db0ecb0d989773dea64212d366e618c29a5552e3e386ac1dd603bf770f484e - tag: prometheus/busybox:latest \ No newline at end of file + value: "a05b141798d02deca8a4161848db333ddaea3463becafa80bb74a6e9fcb57c08" \ No newline at end of file -- GitLab From bc098d992a6d578b1ad95506b249919312faa326 Mon Sep 17 00:00:00 2001 From: bhearn Date: Mon, 7 Dec 2020 15:11:03 -0700 Subject: [PATCH 08/13] update golang version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 649af6f..e04dc44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/google/golang/golang-1.14 -ARG BASE_TAG=1.14.4 +ARG BASE_TAG=1.14.12 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder -- GitLab From 08b0f0d923824df66813480e064a7f7c0855a11a Mon Sep 17 00:00:00 2001 From: bhearn Date: Tue, 8 Dec 2020 09:10:55 -0700 Subject: [PATCH 09/13] add jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..1746412 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline(version: "v0.16.0") \ No newline at end of file -- GitLab From 9286f062b998c0a61b9d42df1079a7e9400341c7 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:19:21 +0000 Subject: [PATCH 10/13] Migrate to hardening_manifest.yaml --- Jenkinsfile | 2 -- download.yaml | 8 ------ hardening_manifest.yaml | 58 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 10 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1746412..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "v0.16.0") \ No newline at end of file diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 550246c..0000000 --- a/download.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -version: v0.16.0 -resources: - - url: https://github.com/thanos-io/thanos/releases/download/v0.16.0/thanos-0.16.0.linux-amd64.tar.gz - filename: thanos.tar.gz - validation: - type: "sha256" - value: "a05b141798d02deca8a4161848db333ddaea3463becafa80bb74a6e9fcb57c08" \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..67217af --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,58 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/thanos/thanos" + +# 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: +- "v0.16.0" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "google/golang/golang-1.14" + BASE_TAG: "1.14.12" + +# Docker image labels +labels: + org.opencontainers.image.title: "thanos" + ## 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: "v0.16.0" + ## 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: +- filename: thanos.tar.gz + url: https://github.com/thanos-io/thanos/releases/download/v0.16.0/thanos-0.16.0.linux-amd64.tar.gz + validation: + type: sha256 + value: a05b141798d02deca8a4161848db333ddaea3463becafa80bb74a6e9fcb57c08 + +# 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: "bhearn@anchore.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 cbb9ecc5b8088b26394113dc1ba9fbea9623b56a Mon Sep 17 00:00:00 2001 From: bhearn Date: Thu, 10 Dec 2020 12:03:27 -0700 Subject: [PATCH 11/13] add hardening manifest changes --- hardening_manifest.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 67217af..a47e45a 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "thanos" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "Thanos is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments." ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "Apache" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://thanos.io/" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "thanos-io" org.opencontainers.image.version: "v0.16.0" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "HA,metrics,Prometheus" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "opensource" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.product.name: "thanos" # List of resources to make available to the offline build context resources: @@ -48,11 +48,11 @@ resources: # FIXME: Include any other vendor information if applicable maintainers: - email: "bhearn@anchore.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 + # The name of the current container owner + name: "Blake Hearn" + # The gitlab username of the current container owner + username: "bhearn" + cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT # - name: "FIXME" # username: "FIXME" # email: "FIXME" -- GitLab From 3dae01741c084108e1e96ab6a4cebaeb218553cb Mon Sep 17 00:00:00 2001 From: bhearn Date: Thu, 10 Dec 2020 12:07:11 -0700 Subject: [PATCH 12/13] add hardening manifest changes --- Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index e04dc44..ea17489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,6 @@ ARG BASE_TAG=1.14.12 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder -LABEL name="Thanos" \ - maintainer="bhearn@anchore.com" \ - vendor="Opensource" \ - version="v0.16.0" \ - release="1" \ - summary="Image of Thanos" \ - description="Thanos is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments." - COPY thanos.tar.gz /opt WORKDIR $GOPATH/src/github.com/thanos-io/thanos @@ -24,7 +16,6 @@ RUN dnf upgrade -y && \ tar -zxf /opt/thanos.tar.gz --strip-components=1 -C /go/bin/ && \ rm -f /opt/thanos.tar.gz -# an approved UBI is used instead of an unapproved quay.io/prometheus/busybox FROM registry1.dsop.io/ironbank/redhat/ubi/ubi8:8.3 COPY --from=builder /go/bin/thanos /bin/thanos -- GitLab From 68dbc7e28d50a30c097e8660f680707fd154d56f Mon Sep 17 00:00:00 2001 From: bhearn Date: Thu, 10 Dec 2020 13:51:29 -0700 Subject: [PATCH 13/13] update thanos --- Dockerfile | 21 +++++++++++---------- hardening_manifest.yaml | 8 ++++---- renovate.json | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 renovate.json diff --git a/Dockerfile b/Dockerfile index ea17489..185a817 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_REGISTRY=registry1.dsop.io -ARG BASE_IMAGE=ironbank/google/golang/golang-1.14 -ARG BASE_TAG=1.14.12 +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 +ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder @@ -8,18 +8,19 @@ COPY thanos.tar.gz /opt WORKDIR $GOPATH/src/github.com/thanos-io/thanos -USER 0 +RUN tar -zxf /opt/thanos.tar.gz --strip-components=1 && \ + rm -f /opt/thanos.tar.gz + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + +COPY --from=builder /src/github.com/thanos-io/thanos/thanos /bin/thanos RUN dnf upgrade -y && \ dnf clean all && \ - rm -rf /var/cache/dnf && \ - tar -zxf /opt/thanos.tar.gz --strip-components=1 -C /go/bin/ && \ - rm -f /opt/thanos.tar.gz - -FROM registry1.dsop.io/ironbank/redhat/ubi/ubi8:8.3 + rm -rf /var/cache/dnf -COPY --from=builder /go/bin/thanos /bin/thanos +USER 1001 ENTRYPOINT [ "/bin/thanos" ] -HEALTHCHECK NONE \ No newline at end of file +HEALTHCHECK CMD curl -f localhost:10902/-/healthy || exit 1 \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a47e45a..de66da1 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -13,8 +13,8 @@ tags: # Build args passed to Dockerfile ARGs args: - BASE_IMAGE: "google/golang/golang-1.14" - BASE_TAG: "1.14.12" + BASE_IMAGE: "redhat/ubi/ubi8" + BASE_TAG: "8.3" # Docker image labels labels: @@ -38,10 +38,10 @@ labels: # List of resources to make available to the offline build context resources: - filename: thanos.tar.gz - url: https://github.com/thanos-io/thanos/releases/download/v0.16.0/thanos-0.16.0.linux-amd64.tar.gz + url: https://github.com/thanos-io/thanos/releases/download/v0.17.2/thanos-0.17.2.linux-amd64.tar.gz validation: type: sha256 - value: a05b141798d02deca8a4161848db333ddaea3463becafa80bb74a6e9fcb57c08 + value: 1bd81a2710d33c53079ada61b91f0337dbf97972fc323f05519002916e191dcd # List of project maintainers # FIXME: Fill in the following details for the current container owner in the whitelist diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..4fe3835 --- /dev/null +++ b/renovate.json @@ -0,0 +1,40 @@ +{ + "assignees": [ + "@bhearn" + ], + "baseBranches": [ + "development" + ], + "packageRules": [ + { + "datasources": [ + "github-releases" + ], + "packageNames": [ + "thanos-io/thanos" + ] + } + ], + "regexManagers": [ + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "thanos-io/thanos", + "datasourceTemplate": "github-releases" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "tags:\\s+-\\s+\"(?.+?)\"" + ], + "depNameTemplate": "thanos-io/thanos", + "datasourceTemplate": "github-releases" + } + ] +} \ No newline at end of file -- GitLab