Skip to content

Commit 4db9877

Browse files
committed
fix git table color
1 parent 2738741 commit 4db9877

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

docs/pages/devops_intro.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<p>Depending on which background and pre-knowledge you have, you need to first make sure to get any missing prerequisite knowledge.</p>
1010
<p>As a system administrator or a network engineer, learn software development workflows. As a developer, learn the basics of infrastructure, virtual servers etc. Of course, with zero or little IT background, you have to get all this prerequisite knowledge from server administration to development first.</p>
1111
<p>&nbsp;</p>
12-
<p><img src="images/cicd-pipeline.PNG" alt="CI/CD pipeline example"></p>
12+
<img src="images/cicd-pipeline.PNG" alt="CI/CD pipeline example">
1313
<p>&nbsp;</p>
1414
<p>DevOps covers the whole software development lifecycle, so you work with lots of different tools and technologies. Plus, DevOps is still evolving and there are lots of new tools being developed all the time.</p>
1515
<p>&nbsp;</p>
1616
<h2><span style="color:#f44336;"><strong>Start here:</strong></span></h2>
1717
<p>&nbsp;</p>
18-
<h3><strong>1. Concepts of Software Development</strong></h3>
18+
<h3><span style="color:#1565c0;"><strong>1. Concepts of Software Development</strong></span></h3>
1919
<p>As a DevOps engineer you will not be programming the application, but as you are working closely with the development team to improve and automate tasks for them, you need to understand the concepts of:</p>
2020
<ul>
2121
<li>How developers work and collaborate (Agile, Jira workflows)</li>
@@ -25,7 +25,7 @@ <h3><strong>1. Concepts of Software Development</strong></h3>
2525
</ul>
2626
<p>And generally understand what the whole software development lifecycle covers from idea to code, all the way to releasing it to end users.</p>
2727
<p>&nbsp;</p>
28-
<h3>2. OS &amp; Linux Basics</h3>
28+
<h3><span style="color:#1565c0;">2. OS &amp; Linux Basics</span></h3>
2929
<p>As a DevOps engineer you are responsible for preparing and maintaining the infrastructure (servers) on which the application is deployed. So you need to know the basics of how to administer a server and install different tools on it.</p>
3030
<p>Since most servers use Linux OS, you need to know and feel comfortable using Linux, especially its Command Line Interface. Basic concepts of Operating Systems you need to understand:</p>
3131
<ul>
@@ -43,7 +43,7 @@ <h3>2. OS &amp; Linux Basics</h3>
4343
<li>HTTP/HTTPS</li>
4444
</ul>
4545
<p>&nbsp;</p>
46-
<h3>3. Containerization - Docker</h3>
46+
<h3><span style="color:#1565c0;">3. Containerization - Docker</span></h3>
4747
<p>Docker is by far the most popular container technology.</p>
4848
<p>As containers have become the new standard of software packaging, you will most probably run your application as a container. This means you need to generally understand:</p>
4949
<ul>
@@ -62,7 +62,7 @@ <h3>3. Containerization - Docker</h3>
6262
<li>Work with Docker Repository</li>
6363
</ul>
6464
<p>&nbsp;</p>
65-
<h3>4. CI/CD Pipelines - Jenkins</h3>
65+
<h3><span style="color:#1565c0;">4. CI/CD Pipelines - Jenkins</span></h3>
6666
<p>CI/CD is kind of the heart of DevOps. In DevOps, all code changes, like new features or bug fixes, need to be integrated into the existing application and deployed to the end users continuously and in an automated way. Hence, the term: Continuous Integration and Continuous Deployment (CI/CD).</p>
6767
<p>When the feature or bug-fix is done, a pipeline running on a CI server (e.g. Jenkins) should be triggered automatically, which:</p>
6868
<ol>
@@ -82,7 +82,7 @@ <h3>4. CI/CD Pipelines - Jenkins</h3>
8282
<li>Configuring artifact repositories (like Nexus) and integrate with pipeline</li>
8383
</ul>
8484
<p>&nbsp;</p>
85-
<h3>5. Learn One Cloud Provider - AWS</h3>
85+
<h3><span style="color:#1565c0;">5. Learn One Cloud Provider - AWS</span></h3>
8686
<p>Some popular Cloud platforms are - AWS, Microsoft Azure, Google Cloud. AWS is the most powerful and most widely used IaaS platform, but also a difficult one.</p>
8787
<p>Nowadays, many companies use virtual infrastructure on the cloud, instead of managing their own infrastructure. These are Infrastructure as a Service (IaaS) platforms, which offer a range of additional services, like backup, security, load balancing etc.</p>
8888
<p>&nbsp;</p>
@@ -94,7 +94,7 @@ <h3>5. Learn One Cloud Provider - AWS</h3>
9494
<li>EC2 service - virtual servers</li>
9595
</ul>
9696
<p>&nbsp;</p>
97-
<h3>6. Container Orchestration - Kubernetes</h3>
97+
<h3><span style="color:#1565c0;">6. Container Orchestration - Kubernetes</span></h3>
9898
<p>Since containers are popular and easy to use, many companies are running hundreds or thousands of containers on multiple servers. This means these containers need to be managed somehow. For this purpose, there are container orchestration tools.</p>
9999
<p>Kubernetes (also known as K8s) is the most popular container orchestration tool. Kubernetes automates the deployment, scaling and management of containerized applications.</p>
100100
<p>So you need to learn:</p>
@@ -110,7 +110,7 @@ <h3>6. Container Orchestration - Kubernetes</h3>
110110
<li>Namespaces</li>
111111
</ul>
112112
<p>&nbsp;</p>
113-
<h3>7. Monitoring &amp; Observability - Prometheus &amp; Grafana</h3>
113+
<h3><span style="color:#1565c0;">7. Monitoring &amp; Observability - Prometheus &amp; Grafana</span></h3>
114114
<p>Once software is in production, it is important to monitor it to track the performance, discover problems in your infrastructure and the application.</p>
115115
<p>So one of your responsibilities as a DevOps engineer is to:</p>
116116
<ul>
@@ -124,7 +124,7 @@ <h3>7. Monitoring &amp; Observability - Prometheus &amp; Grafana</h3>
124124
<p>You should also understand how systems can collect and aggregate data with the goal of using it to troubleshoot, gain business insights etc.</p>
125125
<p><strong>ELK Stack:</strong> A popular log management stack.</p>
126126
<p>&nbsp;</p>
127-
<h3>8. Infrastructure as Code - Ansible &amp; Terraform</h3>
127+
<h3><span style="color:#1565c0;">8. Infrastructure as Code - Ansible &amp; Terraform</span></h3>
128128
<p>Manually creating and maintaining infrastructure is time consuming and error prone. Especially when you need to replicate the infrastructure, e.g. for a Development, Testing and Production environment.</p>
129129
<p>In DevOps, we want to automate as much as possible and that's where Infrastructure as Code comes into the picture.</p>
130130
<p>With IaC we use code to create and configure infrastructure and there are 2 types of IaC tools you need to know:</p>
@@ -136,14 +136,14 @@ <h3>8. Infrastructure as Code - Ansible &amp; Terraform</h3>
136136
<p><strong>Terraform:</strong> This is the most popular infrastructure provisioning tool.</p>
137137
<p><strong>Ansible: </strong>This is the most popular configuration management tool.</p>
138138
<p>&nbsp;</p>
139-
<h3>9. Scripting Language - Python</h3>
139+
<h3><span style="color:#1565c0;">9. Scripting Language - Python</span></h3>
140140
<p>Since you are closely working with developers and system administrators to also automate tasks for development and operations, you will need to write scripts and small applications to automate them. For that, you will need some scripting or basic programming skills.</p>
141141
<p>Examples: utility scripts like flushing the cache, starting the builds and deployments etc.</p>
142142
<p>This could be an OS specific scripting language like bash or Powershell. But what's more demanded is an OS-independent language like Python, Ruby or Go.</p>
143143
<p>These languages are more powerful and flexible. If you know one of these, it will make you much more valuable as a DevOps engineer.</p>
144144
<p>There are many programming languages, but I would recommend starting with Python. Python is widely used, easy to learn and used in many different cases, especially in DevOps.</p>
145145
<p>&nbsp;</p>
146-
<h3>10. Version Control - Git</h3>
146+
<h3><span style="color:#1565c0;">10. Version Control - Git</span></h3>
147147
<p>You write all automation logic as code. And just application code, automation code should also be managed and hosted on a version control tool, like Git.</p>
148148
<p>Git is a CLI Tool, which you install locally. It enables the tracking of changes in the source code and enables better collaboration on code.</p>
149149
<p>So you need to learn:</p>

docs/pages/git_cheatsheet.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
<td style="background-color:rgb(217, 217, 217);border-bottom-style:none;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git config --global user.name "your_name"</strong></span></td>
8888
</tr>
8989
<tr>
90-
<td style="border-bottom-style:none;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git config --global user.email "your_email"</strong></span></td>
90+
<td style="background-color:rgb(207, 207, 207);border-bottom-style:none;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git config --global user.email "your_email"</strong></span></td>
9191
</tr>
9292
<tr>
9393
<td style="background-color:rgb(217, 217, 217);border-bottom-style:none;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git config --global init.default branch main</strong></span></td>
9494
</tr>
9595
<tr>
96-
<td style="border-bottom:0.5pt solid windowtext;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git config --list</strong></span></td>
96+
<td style="background-color:rgb(207, 207, 207);border-bottom:0.5pt solid windowtext;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git config --list</strong></span></td>
9797
</tr>
9898
</tbody>
9999
</table>
@@ -203,15 +203,15 @@
203203
<td style="background-color:rgb(217, 217, 217);border-bottom-style:none;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top:0.5pt solid windowtext;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;width:330pt;" colspan="2"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git log | git log --oneline | git log -p | git log -2 | git log --grep &lt;keyword&gt; | git reflog</strong></span></td>
204204
</tr>
205205
<tr>
206-
<td style="border-bottom-style:none;border-left:0.5pt solid windowtext;border-right-style:none;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git log --all</strong></span></td>
207-
<td style="border-bottom-style:none;border-left-style:none;border-right:0.5pt solid windowtext;border-top-style:none;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;">List all commits from all branches</span></td>
206+
<td style="background-color:rgb(207, 207, 207);border-bottom-style:none;border-left:0.5pt solid windowtext;border-right-style:none;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git log --all</strong></span></td>
207+
<td style="background-color:rgb(207, 207, 207);border-bottom-style:none;border-left-style:none;border-right:0.5pt solid windowtext;border-top-style:none;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;">List all commits from all branches</span></td>
208208
</tr>
209209
<tr>
210210
<td style="background-color:rgb(217, 217, 217);border-bottom-style:none;border-left:0.5pt solid windowtext;border-right:.5pt solid black;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;" colspan="2"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git show &lt;COMMIT&gt;, &lt;object&gt;, &lt;tag&gt;, or &lt;keyword&gt;</strong></span></td>
211211
</tr>
212212
<tr>
213-
<td style="border-bottom:0.5pt solid windowtext;border-left:0.5pt solid windowtext;border-right-style:none;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git clean -n -f -x</strong></span></td>
214-
<td style="border-bottom:0.5pt solid windowtext;border-left-style:none;border-right:0.5pt solid windowtext;border-top-style:none;padding-left:1px;padding-right:1px;padding-top:1px;width:200pt;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;">(-n) check any unnecessary files in current dir. (-f) delete them. (-x) clean .ignore</span></td>
213+
<td style="background-color:rgb(207, 207, 207);border-bottom:0.5pt solid windowtext;border-left:0.5pt solid windowtext;border-right-style:none;border-top-style:none;height:28.05pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>git clean -n -f -x</strong></span></td>
214+
<td style="background-color:rgb(207, 207, 207);border-bottom:0.5pt solid windowtext;border-left-style:none;border-right:0.5pt solid windowtext;border-top-style:none;padding-left:1px;padding-right:1px;padding-top:1px;width:200pt;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;">(-n) check any unnecessary files in current dir. (-f) delete them. (-x) clean .ignore</span></td>
215215
</tr>
216216
</tbody>
217217
</table>
@@ -269,14 +269,14 @@
269269
<td style="background-color:red;border:0.5pt solid windowtext;height:24.0pt;padding-left:1px;padding-right:1px;padding-top:1px;text-align:center;vertical-align:bottom;width:330pt;" colspan="2"><span style="color:white;font-family:&quot;Arial Black&quot;, sans-serif;font-size:16pt;"><strong>Notes</strong></span></td>
270270
</tr>
271271
<tr>
272-
<td style="border-bottom-style:solid;border-color:windowtext;border-left-style:solid;border-right-style:solid;border-top-style:none;border-width:0.5pt;height:39.6pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>cat &gt; .gitignore</strong></span></td>
273-
<td style="border-bottom-style:solid;border-color:windowtext;border-left-style:none;border-right-style:solid;border-top-style:none;border-width:0.5pt;padding-left:1px;padding-right:1px;padding-top:1px;width:200pt;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;">File names mention inside the .gitignore will not be exposed to staging and remain secret.</span></td>
272+
<td style="background-color:rgb(207, 207, 207);border-bottom-style:solid;border-color:windowtext;border-left-style:solid;border-right-style:solid;border-top-style:none;border-width:0.5pt;height:39.6pt;padding-left:1px;padding-right:1px;padding-top:1px;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>cat &gt; .gitignore</strong></span></td>
273+
<td style="background-color:rgb(207, 207, 207);border-bottom-style:solid;border-color:windowtext;border-left-style:none;border-right-style:solid;border-top-style:none;border-width:0.5pt;padding-left:1px;padding-right:1px;padding-top:1px;width:200pt;"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;">File names mention inside the .gitignore will not be exposed to staging and remain secret.</span></td>
274274
</tr>
275275
<tr>
276276
<td style="background-color:rgb(217, 217, 217);border:0.5pt solid windowtext;height:45.6pt;padding-left:1px;padding-right:1px;padding-top:1px;width:330pt;" colspan="2"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>There're Three different environments: 1. WorkSpace (Working directory) 2. Staging (Index) 3. Repository (Commit)</strong></span></td>
277277
</tr>
278278
<tr>
279-
<td style="border:0.5pt solid windowtext;height:50.4pt;padding-left:1px;padding-right:1px;padding-top:1px;width:330pt;" colspan="2"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>Methodes to authenticate remote repository: 1. SSH Keys 2. Personal Access Token (PAT) for HTTPs authentication 3. Two-Factor Authenticaiton</strong></span></td>
279+
<td style="background-color:rgb(207, 207, 207);border:0.5pt solid windowtext;height:50.4pt;padding-left:1px;padding-right:1px;padding-top:1px;width:330pt;" colspan="2"><span style="color:black;font-family:Calibri, sans-serif;font-size:11pt;"><strong>Methodes to authenticate remote repository: 1. SSH Keys 2. Personal Access Token (PAT) for HTTPs authentication 3. Two-Factor Authenticaiton</strong></span></td>
280280
</tr>
281281
</tbody>
282282
</table>

0 commit comments

Comments
 (0)