UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 8270518c authored by Luke Glasscock's avatar Luke Glasscock
Browse files

Resolve merge conflicts

parent 6a11c497
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/components/Footer.vue
+ 4
− 4
View file @ 8270518c
...@@ -78,16 +78,16 @@ ...@@ -78,16 +78,16 @@
<a href="https://software.af.mil/training/" target="_blank"> <a href="https://software.af.mil/training/" target="_blank">
DevSecOps Training DevSecOps Training
</a> </a>
<a href="https://repo1.dsop.io" target="_blank"> <a href="https://repo1.dso.mil" target="_blank">
Repo One Repo One
</a> </a>
<a href="https://repo1.dsop.io/dsawg-devsecops/" target="_blank"> <a href="https://repo1.dso.mil/dsawg-devsecops/" target="_blank">
DSAWG on Repo One DSAWG on Repo One
</a> </a>
<a href="https://ironbank.dso.mil" target="_blank"> <a href="https://ironbank.dso.mil" target="_blank">
Iron Bank Iron Bank
</a> </a>
<a href="https://registry1.dsop.io/" target="_blank" <a href="https://registry1.dso.mil/" target="_blank"
>Registry 1</a >Registry 1</a
> >
</v-col> </v-col>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<a href="https://software.af.mil/training/" target="_blank"> <a href="https://software.af.mil/training/" target="_blank">
Site Map Site Map
</a> </a>
<a href="https://repo1.dsop.io" target="_blank"> <a href="https://repo1.dso.mil" target="_blank">
FAQs FAQs
</a> --> </a> -->
<a href="https://chat.collab.cdl.af.mil/" target="_blank"> <a href="https://chat.collab.cdl.af.mil/" target="_blank">
......
src/components/IntroVideo.vue
+ 1
− 1
View file @ 8270518c
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<v-responsive :aspect-ratio="16 / 9" min-height="200"> <v-responsive :aspect-ratio="16 / 9" min-height="200">
<video width="100%" poster="static/p1-logo.png" controls> <video width="100%" poster="static/p1-logo.png" controls>
<source <source
src="https://repo1.dsop.io/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/PlatformOne-90sec-Initial-V1-1.mp4" src="https://repo1.dso.mil/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/PlatformOne-90sec-Initial-V1-1.mp4"
type="video/mp4" type="video/mp4"
/> />
Your browser does not support the video tag. Your browser does not support the video tag.
......
src/views/ADCE.vue
+ 13
− 13
View file @ 8270518c
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="col-lg-2 col-md-6 col-sm-12"> <div class="col-lg-2 col-md-6 col-sm-12">
<ExternalLink <ExternalLink
class="mt-2" class="mt-2"
href="https://repo1.dsop.io/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/docs/Party_Bus_ATO(Dev&Prod).pdf" href="https://repo1.dso.mil/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/docs/Party_Bus_ATO(Dev&Prod).pdf"
icon="mdi-file-pdf" icon="mdi-file-pdf"
> >
Party Bus Environmental ATOs Party Bus Environmental ATOs
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="col-lg-2 col-md-6 col-sm-12"> <div class="col-lg-2 col-md-6 col-sm-12">
<ExternalLink <ExternalLink
class="mt-2" class="mt-2"
href="https://repo1.dsop.io/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/docs/(U)CNAP_ATO.pdf" href="https://repo1.dso.mil/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/docs/(U)CNAP_ATO.pdf"
icon="mdi-file-pdf" icon="mdi-file-pdf"
> >
CNAP ATO CNAP ATO
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="col-lg-2 col-md-6 col-sm-12"> <div class="col-lg-2 col-md-6 col-sm-12">
<ExternalLink <ExternalLink
class="mt-2" class="mt-2"
href="https://repo1.dsop.io/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/docs/Iron_Bank_Fast_Track_ATO.pdf" href="https://repo1.dso.mil/platform-one/bullhorn-delivery-static-assets/-/raw/master/p1/docs/Iron_Bank_Fast_Track_ATO.pdf"
icon="mdi-file-pdf" icon="mdi-file-pdf"
> >
Iron Bank ATO Iron Bank ATO
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
CICDPipeline, CICDPipeline,
VueEasyLightbox, VueEasyLightbox,
WorkshopIcon, WorkshopIcon,
ExternalLink ExternalLink,
}, },
methods: { methods: {
showImg(index) { showImg(index) {
...@@ -289,7 +289,7 @@ export default { ...@@ -289,7 +289,7 @@ export default {
}, },
getImageUrl(filename) { getImageUrl(filename) {
return require(`@/assets/images/${filename}`); return require(`@/assets/images/${filename}`);
} },
}, },
data: function() { data: function() {
return { return {
...@@ -299,28 +299,28 @@ export default { ...@@ -299,28 +299,28 @@ export default {
index: 0, // default: 0 index: 0, // default: 0
imgs: [ imgs: [
require("@/assets/images/PartyBus-environment-02.png"), require("@/assets/images/PartyBus-environment-02.png"),
require("@/assets/images/P1 - Tool Chain-2.jpg") require("@/assets/images/P1 - Tool Chain-2.jpg"),
] ],
}, },
milestones: [ milestones: [
{ {
done: true, done: true,
text: "Mattermost", text: "Mattermost",
logo: "mattermost-logomark-blue.png" logo: "mattermost-logomark-blue.png",
}, },
{ {
done: true, done: true,
text: "Atlassian (Jira & Confluence)", text: "Atlassian (Jira & Confluence)",
logo: "Atlassian-icon-blue-onecolor@2x.png" logo: "Atlassian-icon-blue-onecolor@2x.png",
}, },
{ {
done: false, done: false,
text: "Mission App Production Clusters", text: "Mission App Production Clusters",
logo: "Party_Bus_logo.png" logo: "Party_Bus_logo.png",
} },
] ],
}; };
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
......
src/views/BigBangOnboarding.vue
+ 17
− 18
View file @ 8270518c
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="text"> <div class="text">
<p> <p>
<a <a
href="https://repo1.dsop.io/platform-one/onboarding/big-bang/big-bang-workshop" href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-workshop"
target="_blank" target="_blank"
> >
2-Day Workshop: 2-Day Workshop:
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</p> </p>
<p> <p>
<a <a
href="https://repo1.dsop.io/platform-one/onboarding/big-bang-residency-info/" href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-residency-info"
target="_blank" target="_blank"
> >
11-Day Residency: 11-Day Residency:
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<p class="mt-8"> <p class="mt-8">
Please read Please read
<a <a
href="https://repo1.dsop.io/platform-one/onboarding/big-bang/big-bang-workshop#workshop-roles-prerequisites" href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-workshop#workshop-roles-prerequisites"
target="_blank" target="_blank"
> >
Workshop Prerequisites Workshop Prerequisites
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<li class="my-2"> <li class="my-2">
<a <a
class="quick-link" class="quick-link"
href="https://repo1.dsop.io/platform-one/onboarding/big-bang/big-bang-workshop" href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-workshop"
target="_blank" target="_blank"
> >
More information on Workshop More information on Workshop
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<li class="my-2"> <li class="my-2">
<a <a
class="quick-link" class="quick-link"
href="https://repo1.dsop.io/platform-one/onboarding/big-bang-residency-info/" href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-residency-info"
target="_blank" target="_blank"
> >
More information on Residency More information on Residency
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<li class="my-2"> <li class="my-2">
<a <a
class="quick-link" class="quick-link"
href="https://repo1.dsop.io/platform-one/onboarding/big-bang/big-bang-workshop#workshop-roles-prerequisites" href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-workshop#workshop-roles-prerequisites"
target="_blank" target="_blank"
> >
Workshop Prerequisites Workshop Prerequisites
...@@ -175,8 +175,7 @@ ...@@ -175,8 +175,7 @@
<li class="my-2"> <li class="my-2">
<a <a
class="quick-link" class="quick-link"
href="https://repo1.dsop.io/platform-one/onboarding/big-bang-residency-info/#residency- href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-residency-info#residency-prerequisite-knowledge"
prerequisite-knowledge"
target="_blank" target="_blank"
> >
Residency Prerequisites Residency Prerequisites
...@@ -249,7 +248,7 @@ export default { ...@@ -249,7 +248,7 @@ export default {
components: { components: {
PageHeader, PageHeader,
Wave, Wave,
GoogleClassroomIcon GoogleClassroomIcon,
}, },
methods: {}, methods: {},
data: function() { data: function() {
...@@ -262,16 +261,16 @@ export default { ...@@ -262,16 +261,16 @@ export default {
details: [ details: [
"Day 1: Overview of Platform One and Big Bang", "Day 1: Overview of Platform One and Big Bang",
"Day 2: Security Overview of P1", "Day 2: Security Overview of P1",
"Days 3 & 4: Big Bang Deployment (cluster, air-gapped Docker registry, air-gapped Git repo)" "Days 3 & 4: Big Bang Deployment (cluster, air-gapped Docker registry, air-gapped Git repo)",
] ],
}, },
{ {
done: false, done: false,
text: "WEEK 2: BIG BANG CONFIG MANAGEMENT AND SECURITY TOOLING", text: "WEEK 2: BIG BANG CONFIG MANAGEMENT AND SECURITY TOOLING",
details: [ details: [
"Days 5 & 6: GitOps, Argo CD, & Secrets", "Days 5 & 6: GitOps, Argo CD, & Secrets",
"Days 7 & 8: GitLab CI and Security Tooling" "Days 7 & 8: GitLab CI and Security Tooling",
] ],
}, },
{ {
done: false, done: false,
...@@ -280,12 +279,12 @@ export default { ...@@ -280,12 +279,12 @@ export default {
details: [ details: [
"Day 9: Operator pattern and consolidated monitoring with Prometheus and Grafana", "Day 9: Operator pattern and consolidated monitoring with Prometheus and Grafana",
"Day 10: Consolidated logging with ECK", "Day 10: Consolidated logging with ECK",
'Day 11: "Day 2" Operations' 'Day 11: "Day 2" Operations',
] ],
} },
] ],
}; };
} },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
......
src/views/Home.vue
+ 4
− 2
View file @ 8270518c
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
<h1 class="mt-0 pl-7">Products</h1> <h1 class="mt-0 pl-7">Products</h1>
</div> </div>
<div v-if="$vuetify.breakpoint.mdAndDown"> <div v-if="$vuetify.breakpoint.mdAndDown">
<h2 class="pl-md-8" style="font-size:2.25rem">Explore The Products</h2> <h2 class="pl-md-8" style="font-size:2.25rem">
Explore The Products
</h2>
</div> </div>
<v-btn <v-btn
v-if="$vuetify.breakpoint.mdAndUp" v-if="$vuetify.breakpoint.mdAndUp"
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
> >
<video width="100%" controls> <video width="100%" controls>
<source <source
src="https://repo1.dsop.io/platform-one/bullhorn-delivery-static-assets/-/raw/master/cso/DoD%20Enterprise%20DevSecOps%20Initiative%20and%20Platform%201.mp4" src="https://repo1.dso.mil/platform-one/bullhorn-delivery-static-assets/-/raw/master/cso/DoD%20Enterprise%20DevSecOps%20Initiative%20and%20Platform%201.mp4"
type="video/mp4" type="video/mp4"
/> />
Your browser does not support the video tag. Your browser does not support the video tag.
......
src/views/IronBank.vue
+ 17
− 11
View file @ 8270518c
...@@ -51,13 +51,19 @@ ...@@ -51,13 +51,19 @@
the application the application
</li> </li>
<li> <li>
Registry1 is a fully compliant Open Container Initiative <a href="https://registry1.dso.mil" target="_blank"
registry. All containers found under the “Iron Bank” project are >Registry One</a
guaranteed to be approved >
is a fully compliant Open Container Initiative registry. All
containers found under the Iron Bank project are guaranteed to
be approved
</li> </li>
<li> <li>
RepoOne is the central repository for the source code to create <a href="https://repo1.dso.mil/dsop" target="_blank"
hardened and evaluated containers for the DoD >Repo One</a
>
is the central repository for the source code to create hardened
and evaluated containers for the DoD
</li> </li>
</ul> </ul>
</div> </div>
...@@ -135,7 +141,7 @@ ...@@ -135,7 +141,7 @@
<v-btn <v-btn
class="my-6 black--text" class="my-6 black--text"
color="light" color="light"
href="https://registry1.dsop.io" href="https://repo1.dso.mil/dsop"
target="_blank" target="_blank"
> >
Registry1 Registry1
...@@ -159,7 +165,7 @@ ...@@ -159,7 +165,7 @@
<v-btn <v-btn
class="my-6" class="my-6"
color="primary" color="primary"
href="https://repo1.dsop.io/dsop" href="https://registry1.dso.mil"
target="_blank" target="_blank"
> >
RepoOne RepoOne
...@@ -185,7 +191,7 @@ ...@@ -185,7 +191,7 @@
<v-btn <v-btn
class="my-6 mx-auto" class="my-6 mx-auto"
color="primary" color="primary"
href="https://repo1.dsop.io/dsop" href="https://repo1.dso.mil/dsop"
target="_blank" target="_blank"
> >
Launch RepoOne Launch RepoOne
...@@ -226,7 +232,7 @@ ...@@ -226,7 +232,7 @@
<v-btn <v-btn
class="my-6 mx-auto" class="my-6 mx-auto"
color="primary" color="primary"
href="https://registry1.dsop.io" href="https://registry1.dso.mil"
target="_blank" target="_blank"
> >
Launch Registry1 Launch Registry1
...@@ -288,7 +294,7 @@ ...@@ -288,7 +294,7 @@
<v-btn <v-btn
class="my-6 mx-auto" class="my-6 mx-auto"
color="primary" color="primary"
href="https://repo1.dsop.io/ironbank-tools/ironbank-pipeline/-/blob/master/README.md" href="https://repo1.dso.mil/ironbank-tools/ironbank-pipeline/-/blob/master/README.md"
target="_blank" target="_blank"
> >
Learn More Learn More
...@@ -331,7 +337,7 @@ ...@@ -331,7 +337,7 @@
<v-btn <v-btn
class="my-6 mx-auto" class="my-6 mx-auto"
color="primary" color="primary"
href="https://repo1.dsop.io/dsop/dccscr/-/tree/master/contributor-onboarding" href="https://repo1.dso.mil/dsop/dccscr/-/tree/master/contributor-onboarding"
target="_blank" target="_blank"
> >
Onboarding Guide Onboarding Guide
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI