From f0df4666da78787132fef071ad670f0300621e29 Mon Sep 17 00:00:00 2001 From: jeason Date: Wed, 14 Oct 2020 14:28:53 -0600 Subject: [PATCH 1/8] Project template: file templates --- .gitlab/CODEOWNERS | 6 +++ .gitlab/issue_templates/Access Request.md | 16 ++++++++ .../issue_templates/Application - Archive.md | 21 +++++++++++ .../issue_templates/Application - Initial.md | 32 ++++++++++++++++ .../issue_templates/Application - Update.md | 35 ++++++++++++++++++ .gitlab/issue_templates/Bug.md | 37 +++++++++++++++++++ .gitlab/issue_templates/Feature Request.md | 32 ++++++++++++++++ .../issue_templates/Leadership Question.md | 7 ++++ .gitlab/issue_templates/New Findings.md | 20 ++++++++++ .../issue_templates/Onboarding Question.md | 7 ++++ .gitlab/issue_templates/Pipeline Failure.md | 31 ++++++++++++++++ 11 files changed, 244 insertions(+) create mode 100644 .gitlab/CODEOWNERS create mode 100644 .gitlab/issue_templates/Access Request.md create mode 100644 .gitlab/issue_templates/Application - Archive.md create mode 100644 .gitlab/issue_templates/Application - Initial.md create mode 100644 .gitlab/issue_templates/Application - Update.md create mode 100644 .gitlab/issue_templates/Bug.md create mode 100644 .gitlab/issue_templates/Feature Request.md create mode 100644 .gitlab/issue_templates/Leadership Question.md create mode 100644 .gitlab/issue_templates/New Findings.md create mode 100644 .gitlab/issue_templates/Onboarding Question.md create mode 100644 .gitlab/issue_templates/Pipeline Failure.md diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS new file mode 100644 index 0000000..64a2c68 --- /dev/null +++ b/.gitlab/CODEOWNERS @@ -0,0 +1,6 @@ +[Pipelines] +.gitlab-ci.yml @ironbank-notifications/cht +.gitlab-ci.yaml @ironbank-notifications/cht + +[Gitlab Configuration Files] +.gitlab/* @ironbank-notifications/cht diff --git a/.gitlab/issue_templates/Access Request.md b/.gitlab/issue_templates/Access Request.md new file mode 100644 index 0000000..1a7b224 --- /dev/null +++ b/.gitlab/issue_templates/Access Request.md @@ -0,0 +1,16 @@ +## Summary + +The following individuals are requesting access to this project (one per line): +(List or tag all individuals here) + + +The access level should be: +- [ ] Developer access +- [ ] Remove access + + +## Definition of Done +- [ ] All accounts have been provided the necessary accesses + + +/label ~"Access" ~"To Do" \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Archive.md b/.gitlab/issue_templates/Application - Archive.md new file mode 100644 index 0000000..9f3b5fe --- /dev/null +++ b/.gitlab/issue_templates/Application - Archive.md @@ -0,0 +1,21 @@ +## Summary + +Requesting this application be archived due to one of the following reasons: +- [ ] Version is no longer supported by vendor +- [ ] Application is End-Of-Life +- [ ] License violation. +- [ ] Other. See below. + +## Detailed Description + +(Please provide a detailed description of why this application should be archived) + + +## Definition of Done +- [ ] Application has been reviewed for archival +- [ ] Project is officially marked as stale +- [ ] Iron Bank frontend no longer lists application as available or approved + + +/label ~"Container::Archive" +/cc @ironbank-notifications/archive \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Initial.md b/.gitlab/issue_templates/Application - Initial.md new file mode 100644 index 0000000..6594a05 --- /dev/null +++ b/.gitlab/issue_templates/Application - Initial.md @@ -0,0 +1,32 @@ +## Summary + +Requesting application to be hardened. This is only for initial hardening of a container. + + +## Version Information + +Current version: (State the current version of the application as you see it) + +Under support: (Is the updated version within the same major version of the application or is this a new major version?) + + +## Definition of Done +Hardening: +- [ ] Container builds successfully +- [ ] Greylist file has been created (requires a member from container hardening) +- [ ] Branch has been merged into `development` + +Justifications: +- [ ] All findings have been justified per the above documentation +- [ ] Justifications have been provided to the container hardening team + +Approval Process (container hardening team processes): +- [ ] Peer review from Container Hardening Team +- [ ] Findings Approver has reviewed and approved all justifications +- [ ] Approval request has been sent to Authorizing Official +- [ ] Approval request has been processed by Authorizing Official + + + +/label ~"Container::Initial" +/cc @ironbank-notifications/cht \ No newline at end of file diff --git a/.gitlab/issue_templates/Application - Update.md b/.gitlab/issue_templates/Application - Update.md new file mode 100644 index 0000000..caebb3e --- /dev/null +++ b/.gitlab/issue_templates/Application - Update.md @@ -0,0 +1,35 @@ +## Summary + +Requesting application be updated to a newer version. + + + +## Version Information + +Current version: (State the current version of the application as you see it) + +Updated version: (State the version you would like the application updated to) + +Under support: (Is the updated version within the same major version of the application or is this a new major version?) + + +## Definition of Done +Hardening: +- [ ] Container builds successfully +- [ ] Container version has been updated in greylist file +- [ ] Branch has been merged into `development` + +Justifications: +- [ ] All findings have been justified per the above documentation +- [ ] Justifications have been provided to the container hardening team + +Approval Process: +- [ ] Peer review from Container Hardening Team +- [ ] Findings Approver has reviewed and approved all justifications +- [ ] Approval request has been sent to Authorizing Official +- [ ] Approval request has been processed by Authorizing Official + + + +/label ~"Container::Update" +/cc @ironbank-notifications/updates \ No newline at end of file diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md new file mode 100644 index 0000000..1427a0c --- /dev/null +++ b/.gitlab/issue_templates/Bug.md @@ -0,0 +1,37 @@ +## Summary + +(Summarize the bug encountered concisely) + + +## Steps to reproduce + +(How one can reproduce the issue - this is very important) + + +## What is the current bug behavior? + +(What actually happens) + + +## What is the expected correct behavior? + +(What you should see instead) + + +## Relevant logs and/or screenshots + +(Paste any relevant logs - please use code blocks (```) to format console output, +logs, and code as it's very hard to read otherwise.) + + +## Possible fixes + +(If you can, link to the line of code that might be responsible for the problem) + + +## Defintion of Done +- [ ] Bug has been identified and corrected within the container + + +/label ~Bug +/cc @ironbank-notifications/bug \ No newline at end of file diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md new file mode 100644 index 0000000..a0e2f19 --- /dev/null +++ b/.gitlab/issue_templates/Feature Request.md @@ -0,0 +1,32 @@ +## Feature description + +(Detailed description of the feature being requested) + + +## Use cases + + +(Detailed description of the use case for this feature) + + +## Benefits + +(How does this benefit others) + + +## Requirements + +(Any requirements for this feature to be enabled?) + + +## Links / references + +(List of links or references that support this feature) + + +## Definition of Done +- [ ] Feature has been implemented + + +/label ~Feature +/cc @ironbank-notifications/feature \ No newline at end of file diff --git a/.gitlab/issue_templates/Leadership Question.md b/.gitlab/issue_templates/Leadership Question.md new file mode 100644 index 0000000..4674f82 --- /dev/null +++ b/.gitlab/issue_templates/Leadership Question.md @@ -0,0 +1,7 @@ +## Leadership question + +(Detailed description of the question you'd like to ask the leadership team) + + +/label ~"Question::Leadership" ~"To Do" +/cc @ironbank-notifications/leadership \ No newline at end of file diff --git a/.gitlab/issue_templates/New Findings.md b/.gitlab/issue_templates/New Findings.md new file mode 100644 index 0000000..068d029 --- /dev/null +++ b/.gitlab/issue_templates/New Findings.md @@ -0,0 +1,20 @@ +## Summary + +Container has new findings discovered during continuous monitoring. + + + +## Definition of Done +Justifications: +- [ ] All findings have been justified +- [ ] Justifications have been provided to the container hardening team + +Approval Process: +- [ ] Findings Approver has reviewed and approved all justifications +- [ ] Approval request has been sent to Authorizing Official +- [ ] Approval request has been processed by Authorizing Official + + + +/label ~"Container::New Findings" +/cc @ironbank-notifications/security \ No newline at end of file diff --git a/.gitlab/issue_templates/Onboarding Question.md b/.gitlab/issue_templates/Onboarding Question.md new file mode 100644 index 0000000..77dea11 --- /dev/null +++ b/.gitlab/issue_templates/Onboarding Question.md @@ -0,0 +1,7 @@ +## Onboarding question + +(Detailed description of the question you'd like to ask the onboarding team) + + +/label ~"Question::Onboarding" ~"To Do" +/cc @ironbank-notifications/onboarding \ No newline at end of file diff --git a/.gitlab/issue_templates/Pipeline Failure.md b/.gitlab/issue_templates/Pipeline Failure.md new file mode 100644 index 0000000..28b82a9 --- /dev/null +++ b/.gitlab/issue_templates/Pipeline Failure.md @@ -0,0 +1,31 @@ +## Summary + +(Summarize the pipeline issue encountered concisely) + + +## Link to failed pipeline + +(Link to the failed pipeline) + + +## What is the current bug behavior? + +(What actually happens) + + +## What is the expected correct behavior? + +(What you should see instead) + + +## Possible fixes + +(If you can, link to the line of code that might be responsible for the problem) + + +## Definition of Done +- [ ] Pipeline failure has been resolved + + +/label ~Pipeline +/cc @ironbank-notifications/pipelines \ No newline at end of file -- GitLab From 3e410d5dc462151eeb249c52153e8725d66f8645 Mon Sep 17 00:00:00 2001 From: bsumner Date: Wed, 11 Nov 2020 09:18:03 -0600 Subject: [PATCH 2/8] updated sha and bcore version --- Dockerfile | 2 +- Jenkinsfile | 2 +- download.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 112b529..ee1121a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -ARG VERSION=1.4.2 +ARG VERSION=2.2.0 LABEL name="Beast Core" \ maintainer="matt.stover@beast-code.com" \ diff --git a/Jenkinsfile b/Jenkinsfile index 499fe35..25e61ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "1.4.2") \ No newline at end of file +dccscrPipeline(version: "2.2.0") \ No newline at end of file diff --git a/download.json b/download.json index e27c794..e38b719 100644 --- a/download.json +++ b/download.json @@ -6,7 +6,7 @@ "validation": { "type": "sha256", - "value": "2e338758d1257b31bb04d7ad8134a1c86d7cf5ab5599fdc7cddf8473333e6983" + "value": "3e3798b1229aa58bd3a2cdf2555d3c616c9359ae5bcc40b7f4f77115fa9ff2a2" }, "auth": { -- GitLab From 0680d6b825a6507737315eeebf2844bf2fb4257a Mon Sep 17 00:00:00 2001 From: bsumner Date: Wed, 11 Nov 2020 14:01:25 -0600 Subject: [PATCH 3/8] updated sha for latest beast-core.tar.gz file --- download.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.json b/download.json index e38b719..6512fe4 100644 --- a/download.json +++ b/download.json @@ -6,7 +6,7 @@ "validation": { "type": "sha256", - "value": "3e3798b1229aa58bd3a2cdf2555d3c616c9359ae5bcc40b7f4f77115fa9ff2a2" + "value": "ef572de90f38de85b272da389edef78d8965ef5b6bb7148f4e0848a3411510c9" }, "auth": { -- GitLab From e4278c094d6119759f536a19b537aa2f3940fb39 Mon Sep 17 00:00:00 2001 From: bsumner Date: Mon, 16 Nov 2020 10:22:20 -0600 Subject: [PATCH 4/8] updated version info --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- download.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee1121a..ade0a3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -ARG VERSION=2.2.0 +ARG VERSION=2.4.0 LABEL name="Beast Core" \ maintainer="matt.stover@beast-code.com" \ @@ -51,4 +51,4 @@ HEALTHCHECK --interval=12s --timeout=10s --start-period=30s \ ENTRYPOINT ["/usr/local/bin/dumb-init", "--"] -CMD ["/beast-core/server/BCServer.Server"] \ No newline at end of file +CMD ["/beast-core/start.sh"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 25e61ed..a09a961 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "2.2.0") \ No newline at end of file +dccscrPipeline(version: "2.4.0") \ No newline at end of file diff --git a/download.json b/download.json index 6512fe4..20516cc 100644 --- a/download.json +++ b/download.json @@ -6,7 +6,7 @@ "validation": { "type": "sha256", - "value": "ef572de90f38de85b272da389edef78d8965ef5b6bb7148f4e0848a3411510c9" + "value": "f64132435f6f13b54b487efe35d62273af282ec3f19462e0a2006978ce1f39d2" }, "auth": { -- GitLab From 5f748244550ba803c310b8a431a593c0bc2b448f Mon Sep 17 00:00:00 2001 From: bsumner Date: Tue, 17 Nov 2020 07:06:32 -0600 Subject: [PATCH 5/8] updated sha and beastcore.tar.gz --- download.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.json b/download.json index 20516cc..ca7cf6d 100644 --- a/download.json +++ b/download.json @@ -6,7 +6,7 @@ "validation": { "type": "sha256", - "value": "f64132435f6f13b54b487efe35d62273af282ec3f19462e0a2006978ce1f39d2" + "value": "65abf060caef6117bb93cfcbba590cef0de64f38896eac909c24b718e5f8290a" }, "auth": { -- GitLab From 59a2646915524d6f78f37c84c001716c1916f8b4 Mon Sep 17 00:00:00 2001 From: bsumner Date: Wed, 18 Nov 2020 19:29:57 -0600 Subject: [PATCH 6/8] added scripts dir and updated dockerfile --- Dockerfile | 2 ++ scripts/start.sh | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 scripts/start.sh diff --git a/Dockerfile b/Dockerfile index ade0a3a..3c1338a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,8 @@ RUN chmod 755 /usr/local/bin/dumb-init && \ chown -R $UID:$GID ./beast-core/ && \ rm beast-core.tar.gz +COPY --chown=1000:1000 scripts/start.sh /beast-core/ + COPY --chown=1000:1000 config/appsettings.json config/config.json /beast-core/server/ WORKDIR /beast-core/server diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100644 index 0000000..3f12dbf --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +/beast-core/server/BCServer.Server \ + --WWWRoot /beast-core/beast-core-client \ + --deployment /beast-core/config.json \ + --urls "http://*:$PORT" \ + --workspaceRoot $WORKSPACE_PATH -- GitLab From b7bf51150d63e81c75eb891b00a09e720ea120c7 Mon Sep 17 00:00:00 2001 From: bsumner Date: Thu, 19 Nov 2020 08:06:38 -0600 Subject: [PATCH 7/8] updated dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c1338a..1cc3319 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ RUN chmod 755 /usr/local/bin/dumb-init && \ COPY --chown=1000:1000 scripts/start.sh /beast-core/ -COPY --chown=1000:1000 config/appsettings.json config/config.json /beast-core/server/ +COPY config/appsettings.json config/config.json /beast-core/server/ WORKDIR /beast-core/server -- GitLab From f38fd37612e49e1ca6e837acbe3039b39c8705de Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 19 Nov 2020 16:51:35 +0000 Subject: [PATCH 8/8] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cc3319..3fc15a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io +ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=redhat/ubi/ubi8 -ARG BASE_TAG=8.2 +ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -- GitLab