From ca5e157db0a37ca3a10ab96cefdb63b3b39d6c32 Mon Sep 17 00:00:00 2001 From: Luke Glasscock <luke.glasscock@ascellatech.com> Date: Fri, 11 Dec 2020 10:34:22 -0700 Subject: [PATCH] Update url changes --- .../ADCE/Onboarding/FAQs/Logistics.js | 76 +++++++++---------- src/components/Footer.vue | 12 +-- src/components/ProductsSummary.vue | 2 +- src/views/IronBank.vue | 4 +- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/components/ADCE/Onboarding/FAQs/Logistics.js b/src/components/ADCE/Onboarding/FAQs/Logistics.js index 5eb18a56..a6970867 100644 --- a/src/components/ADCE/Onboarding/FAQs/Logistics.js +++ b/src/components/ADCE/Onboarding/FAQs/Logistics.js @@ -8,8 +8,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -34,7 +34,7 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` What logistics should I have for the cohorts? @@ -46,7 +46,7 @@ const Logistics = [ Additionally, you can help yourself speed things up by making a Platform One IL2 SSO account and joining the IL2 mattermost by following the instructions here: https://sso-info.il2.dsop.io/ - ` + `, }, { header: `Are Mac machines required?`, @@ -55,8 +55,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -77,13 +77,13 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` Are Mac machines required? Mac is ideal, but Linux or a Windows machine with Windows Subsystem for Linux will work as well. - ` + `, }, { header: `Do we need to have a product already built or conceived before we attend the cohort?`, @@ -92,8 +92,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -110,7 +110,7 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` Do we need to have a product already built or conceived before we attend the cohort? @@ -120,7 +120,7 @@ const Logistics = [ team to learn CI/CD and practice the principals learned in week 1-3. Alternatively, you could leave the course, but it is recommended that you practice what was learned. - ` + `, }, { header: `Can we provide our own hardened container images?`, @@ -129,8 +129,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -141,22 +141,22 @@ const Logistics = [ hardened, the vendor will need to provide the container image directly to the IronBank team. Iron Bank reviews, integrates, and works with the AF CSO to get it approved. Iron Bank will - list approved containers in ironbank.dsop.io for DoD community + list approved containers in ironbank.dso.mil for DoD community access. </TextHighlight> </p> </div> ); - } + }, }, raw: ` No, the process is that when a new container needs to be hardened, the vendor will need to provide the container image directly to the IronBank team. Iron Bank reviews, integrates, and works with the AF CSO to get it approved. Iron Bank will - list approved containers in ironbank.dsop.io for DoD community + list approved containers in ironbank.dso.mil for DoD community access. - ` + `, }, { header: `How long will we need to wait for our container to be hardened?`, @@ -165,8 +165,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -177,10 +177,10 @@ const Logistics = [ community needs. You can see the list of completed containers in the Iron Bank: </TextHighlight> - <a href="https://ironbank.dsop.io/ironbank/repomap"> + <a href="https://ironbank.dso.mil/ironbank/repomap"> <TextHighlight queries={this.queries}> {" "} - https://ironbank.dsop.io/ironbank/repomap{" "} + https://ironbank.dso.mil/ironbank/repomap{" "} </TextHighlight> </a> </p> @@ -196,15 +196,15 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` How long will we need to wait for our container to be hardened? The container image will be prioritized for use based on community needs. You can see the list of completed containers in the Iron Bank: - https://ironbank.dsop.io/ironbank/repomap + https://ironbank.dso.mil/ironbank/repomap Contact af.cso@mail.mil for Container Hardening Priorities. - ` + `, }, { header: `Can we harden our own image?`, @@ -213,8 +213,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -235,14 +235,14 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` "Yes you can get the baseline approved by the Chief Software Officer of the Air Force - Nic Chaillan, but you will be responsible for managing and patching the image moving forward. For more information please contact: af.cso@us.af.mil" - ` + `, }, { header: `Is RHEL's container licensed by DoD Platform One?`, @@ -251,8 +251,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -267,7 +267,7 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` Is RHEL's container licensed by DoD Platform One? @@ -275,7 +275,7 @@ const Logistics = [ compute node. Right now, all Party Bus and managed nodes use RHEL; if you are launching your own clusters, be sure to take this into consideration. - ` + `, }, { header: `Can you provide instructions for the MIPR process?`, @@ -284,8 +284,8 @@ const Logistics = [ props: { queries: { type: Array, - default: [] - } + default: [], + }, }, render() { return ( @@ -306,13 +306,13 @@ const Logistics = [ </p> </div> ); - } + }, }, raw: ` This will be a separate email. Please contact Cody Paul at christopher.paul.3@us.af.mil for the full set of instructions. - ` - } + `, + }, ]; export default Logistics; diff --git a/src/components/Footer.vue b/src/components/Footer.vue index ce0823e5..a66345bc 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -84,7 +84,7 @@ <a href="https://repo1.dsop.io/dsawg-devsecops/" target="_blank"> DSAWG on Repo One </a> - <a href="https://ironbank.dsop.io" target="_blank"> + <a href="https://ironbank.dso.mil" target="_blank"> Iron Bank </a> <a href="https://registry1.dsop.io/" target="_blank" @@ -126,11 +126,11 @@ </footer> </template> <script> -import PlatformOneWordMarkLogo from '@/assets/images/logos/P1_Wordmark_WH.svg'; -import LinkedInLogo from '@/assets/images/logos/social/linkedin.svg'; -import YouTubeLogo from '@/assets/images/logos/social/youtube.svg'; -import MediumLogo from '@/assets/images/logos/social/medium.svg'; -import AirForceLogo from '@/assets/images/branches/AF-logo.svg'; +import PlatformOneWordMarkLogo from "@/assets/images/logos/P1_Wordmark_WH.svg"; +import LinkedInLogo from "@/assets/images/logos/social/linkedin.svg"; +import YouTubeLogo from "@/assets/images/logos/social/youtube.svg"; +import MediumLogo from "@/assets/images/logos/social/medium.svg"; +import AirForceLogo from "@/assets/images/branches/AF-logo.svg"; export default { components: { diff --git a/src/components/ProductsSummary.vue b/src/components/ProductsSummary.vue index 8b06a29a..75840e0d 100644 --- a/src/components/ProductsSummary.vue +++ b/src/components/ProductsSummary.vue @@ -80,7 +80,7 @@ that have been hardened and accredited for DoD-wide use across classifications. </p> - <ExternalLink class="mb-2" href="https://ironbank.dsop.io"> + <ExternalLink class="mb-2" href="https://ironbank.dso.mil"> Iron Bank Repo </ExternalLink> <v-card-actions class="mt-auto mb-4"> diff --git a/src/views/IronBank.vue b/src/views/IronBank.vue index 56535738..5fb5306a 100644 --- a/src/views/IronBank.vue +++ b/src/views/IronBank.vue @@ -5,7 +5,7 @@ subtext description="Iron Bank is Platform One's authorized, hardened, and approved container repository that supports the end to end lifecycle needed for modern software development." buttonText="Visit the Website" - buttonUrl="https://ironbank.dsop.io" + buttonUrl="https://ironbank.dso.mil" buttonTarget="_blank" :logoSource="ibLogo" /> @@ -127,7 +127,7 @@ <v-btn class="my-6 mr-6" color="primary" - href="https://ironbank.dsop.io" + href="https://ironbank.dso.mil" target="_blank" > Explore Iron Bank -- GitLab