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 @@
<a href="https://software.af.mil/training/" target="_blank">
DevSecOps Training
</a>
<a href="https://repo1.dsop.io" target="_blank">
<a href="https://repo1.dso.mil" target="_blank">
Repo One
</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
</a>
<a href="https://ironbank.dso.mil" target="_blank">
Iron Bank
</a>
<a href="https://registry1.dsop.io/" target="_blank"
<a href="https://registry1.dso.mil/" target="_blank"
>Registry 1</a
>
</v-col>
......@@ -104,7 +104,7 @@
<a href="https://software.af.mil/training/" target="_blank">
Site Map
</a>
<a href="https://repo1.dsop.io" target="_blank">
<a href="https://repo1.dso.mil" target="_blank">
FAQs
</a> -->
<a href="https://chat.collab.cdl.af.mil/" target="_blank">
......
src/components/IntroVideo.vue
+ 1
− 1
View file @ 8270518c
......@@ -10,7 +10,7 @@
<v-responsive :aspect-ratio="16 / 9" min-height="200">
<video width="100%" poster="static/p1-logo.png" controls>
<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"
/>
Your browser does not support the video tag.
......
src/views/ADCE.vue
+ 13
− 13
View file @ 8270518c
......@@ -39,7 +39,7 @@
<div class="col-lg-2 col-md-6 col-sm-12">
<ExternalLink
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"
>
Party Bus Environmental ATOs
......@@ -48,7 +48,7 @@
<div class="col-lg-2 col-md-6 col-sm-12">
<ExternalLink
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"
>
CNAP ATO
......@@ -57,7 +57,7 @@
<div class="col-lg-2 col-md-6 col-sm-12">
<ExternalLink
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"
>
Iron Bank ATO
......@@ -277,7 +277,7 @@ export default {
CICDPipeline,
VueEasyLightbox,
WorkshopIcon,
ExternalLink
ExternalLink,
},
methods: {
showImg(index) {
......@@ -289,7 +289,7 @@ export default {
},
getImageUrl(filename) {
return require(`@/assets/images/${filename}`);
}
},
},
data: function() {
return {
......@@ -299,28 +299,28 @@ export default {
index: 0, // default: 0
imgs: [
require("@/assets/images/PartyBus-environment-02.png"),
require("@/assets/images/P1 - Tool Chain-2.jpg")
]
require("@/assets/images/P1 - Tool Chain-2.jpg"),
],
},
milestones: [
{
done: true,
text: "Mattermost",
logo: "mattermost-logomark-blue.png"
logo: "mattermost-logomark-blue.png",
},
{
done: true,
text: "Atlassian (Jira & Confluence)",
logo: "Atlassian-icon-blue-onecolor@2x.png"
logo: "Atlassian-icon-blue-onecolor@2x.png",
},
{
done: false,
text: "Mission App Production Clusters",
logo: "Party_Bus_logo.png"
}
]
logo: "Party_Bus_logo.png",
},
],
};
}
},
};
</script>
<style lang="scss">
......
src/views/BigBangOnboarding.vue
+ 17
− 18
View file @ 8270518c
......@@ -31,7 +31,7 @@
<div class="text">
<p>
<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"
>
2-Day Workshop:
......@@ -40,7 +40,7 @@
</p>
<p>
<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"
>
11-Day Residency:
......@@ -78,7 +78,7 @@
<p class="mt-8">
Please read
<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"
>
Workshop Prerequisites
......@@ -144,7 +144,7 @@
<li class="my-2">
<a
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"
>
More information on Workshop
......@@ -153,7 +153,7 @@
<li class="my-2">
<a
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"
>
More information on Residency
......@@ -162,7 +162,7 @@
<li class="my-2">
<a
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"
>
Workshop Prerequisites
......@@ -175,8 +175,7 @@
<li class="my-2">
<a
class="quick-link"
href="https://repo1.dsop.io/platform-one/onboarding/big-bang-residency-info/#residency-
prerequisite-knowledge"
href="https://repo1.dso.mil/platform-one/onboarding/big-bang/big-bang-residency-info#residency-prerequisite-knowledge"
target="_blank"
>
Residency Prerequisites
......@@ -249,7 +248,7 @@ export default {
components: {
PageHeader,
Wave,
GoogleClassroomIcon
GoogleClassroomIcon,
},
methods: {},
data: function() {
......@@ -262,16 +261,16 @@ export default {
details: [
"Day 1: Overview of Platform One and Big Bang",
"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,
text: "WEEK 2: BIG BANG CONFIG MANAGEMENT AND SECURITY TOOLING",
details: [
"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,
......@@ -280,12 +279,12 @@ export default {
details: [
"Day 9: Operator pattern and consolidated monitoring with Prometheus and Grafana",
"Day 10: Consolidated logging with ECK",
'Day 11: "Day 2" Operations'
]
}
]
'Day 11: "Day 2" Operations',
],
},
],
};
}
},
};
</script>
<style lang="scss">
......
src/views/Home.vue
+ 4
− 2
View file @ 8270518c
......@@ -17,7 +17,9 @@
<h1 class="mt-0 pl-7">Products</h1>
</div>
<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>
<v-btn
v-if="$vuetify.breakpoint.mdAndUp"
......@@ -77,7 +79,7 @@
>
<video width="100%" controls>
<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"
/>
Your browser does not support the video tag.
......
src/views/IronBank.vue
+ 17
− 11
View file @ 8270518c
......@@ -51,13 +51,19 @@
the application
</li>
<li>
Registry1 is a fully compliant Open Container Initiative
registry. All containers found under the “Iron Bank” project are
guaranteed to be approved
<a href="https://registry1.dso.mil" target="_blank"
>Registry One</a
>
is a fully compliant Open Container Initiative registry. All
containers found under the Iron Bank project are guaranteed to
be approved
</li>
<li>
RepoOne is the central repository for the source code to create
hardened and evaluated containers for the DoD
<a href="https://repo1.dso.mil/dsop" target="_blank"
>Repo One</a
>
is the central repository for the source code to create hardened
and evaluated containers for the DoD
</li>
</ul>
</div>
......@@ -135,7 +141,7 @@
<v-btn
class="my-6 black--text"
color="light"
href="https://registry1.dsop.io"
href="https://repo1.dso.mil/dsop"
target="_blank"
>
Registry1
......@@ -159,7 +165,7 @@
<v-btn
class="my-6"
color="primary"
href="https://repo1.dsop.io/dsop"
href="https://registry1.dso.mil"
target="_blank"
>
RepoOne
......@@ -185,7 +191,7 @@
<v-btn
class="my-6 mx-auto"
color="primary"
href="https://repo1.dsop.io/dsop"
href="https://repo1.dso.mil/dsop"
target="_blank"
>
Launch RepoOne
......@@ -226,7 +232,7 @@
<v-btn
class="my-6 mx-auto"
color="primary"
href="https://registry1.dsop.io"
href="https://registry1.dso.mil"
target="_blank"
>
Launch Registry1
......@@ -288,7 +294,7 @@
<v-btn
class="my-6 mx-auto"
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"
>
Learn More
......@@ -331,7 +337,7 @@
<v-btn
class="my-6 mx-auto"
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"
>
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