Skip to content

Commit

Permalink
Update images and tables
Browse files Browse the repository at this point in the history
  • Loading branch information
brikis98 committed Jun 10, 2024
1 parent 4087fef commit 96a0612
Show file tree
Hide file tree
Showing 34 changed files with 1,082 additions and 940 deletions.
16 changes: 8 additions & 8 deletions docs/02.html
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@
<ul class="nav nav-pills flex-column"><li class="nav-item"><a href="#how_to_deploy_your_app" class="nav-link">1. An Introduction to DevOps and Software Delivery</a>
</li>

<li class="nav-item"><a href="#world_class_delivery" class="nav-link">1.1. A primer on DevOps</a>
<li class="nav-item"><a href="#world_class_delivery" class="nav-link">1.1. A Primer on DevOps</a>

<ul class="nav nav-pills flex-column">

Expand All @@ -937,12 +937,12 @@

<li class="nav-item"><a href="#_stage_3" class="nav-link">Stage 3</a></li>

<li class="nav-item"><a href="#_adopting_devops_practices" class="nav-link">Adopting DevOps practices</a></li>

</ul>

</li>

<li class="nav-item"><a href="#_adopting_devops_practices" class="nav-link">1.1.3. Adopting DevOps Practices</a></li>

</ul>

</li>
Expand Down Expand Up @@ -1130,7 +1130,7 @@ <h1 id="how_to_deploy_your_app">Part 1. An Introduction to DevOps and Software D

<div class="sect2">

<h2 id="world_class_delivery">A primer on DevOps</h2>
<h2 id="world_class_delivery">A Primer on DevOps</h2>

<div class="paragraph">

Expand Down Expand Up @@ -2260,9 +2260,11 @@ <h4 id="_stage_3">Stage 3</h4>

</div>

<div class="sect4">
</div>

<h4 id="_adopting_devops_practices">Adopting DevOps practices</h4>
<div class="sect3">

<h3 id="_adopting_devops_practices">Adopting DevOps Practices</h3>

<div class="paragraph">

Expand Down Expand Up @@ -2482,8 +2484,6 @@ <h4 id="_adopting_devops_practices">Adopting DevOps practices</h4>

</div>

</div>

<div class="sect2">

<h2 id="_an_introduction_to_deploying_apps">An Introduction to Deploying Apps</h2>
Expand Down
304 changes: 228 additions & 76 deletions docs/04.html

Large diffs are not rendered by default.

172 changes: 89 additions & 83 deletions docs/05.html

Large diffs are not rendered by default.

68 changes: 25 additions & 43 deletions docs/06.html
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,11 @@ <h2 id="_continuous_integration_ci">Continuous Integration (CI)</h2>

<p>A better approach, as described in option #2, is <em>continuous integration (CI)</em>, which is software development practice

with the following key property:</p>
where every developer on your team merges their work together on a very regular basis: typically daily or multiple

times per day. The key benefit of CI is that it exposes problems with your work earlier in the process, before you&#8217;ve

gone too far in the wrong direction, and allows you to make improvements incrementally.</p>

</div>

Expand All @@ -1256,7 +1260,7 @@ <h2 id="_continuous_integration_ci">Continuous Integration (CI)</h2>

<div class="paragraph">

<p>All developers merge all their work together on a regular basis: typically daily or multiple times per day.</p>
<p>Ensure all developers merge all their work together on a regular basis: typically daily or multiple times per day.</p>

</div>

Expand All @@ -1270,14 +1274,6 @@ <h2 id="_continuous_integration_ci">Continuous Integration (CI)</h2>

<div class="paragraph">

<p>The key benefit of CI is that it exposes problems with your work earlier in the process, before you&#8217;ve

gone too far in the wrong direction, and allows you to make improvements incrementally.</p>

</div>

<div class="paragraph">

<p>The most common way to implement continuous integration is to use a <em>trunk-based development model</em>, where developers

do all of their work on the same branch, typically <code>main</code> or <code>master</code> or <code>trunk</code>, depending on what
Expand Down Expand Up @@ -1616,7 +1612,9 @@ <h3 id="_making_large_changes">Making Large Changes</h3>

<div class="paragraph">

<p>There are two approaches that you can use to resolve this:</p>
<p>There are two approaches that you can use to resolve this: branch by abstraction and feature toggles. These two

techniques are the focus of the next two sections.</p>

</div>

Expand Down Expand Up @@ -1652,12 +1650,6 @@ <h3 id="_making_large_changes">Making Large Changes</h3>

</div>

<div class="paragraph">

<p>What are branch by abstraction and feature toggles? These two techniques are the focus of the next two sections.</p>

</div>

<div class="sect4">

<h4 id="branch_by_abstraction">Branch by abstraction</h4>
Expand Down Expand Up @@ -2586,7 +2578,9 @@ <h3 id="_machine_user_credentials_and_automatically_provisioned_credentials">Mac

<div class="paragraph">

<p>So if you can&#8217;t use the credentials of a real user, what do you do? These days, there are two main options:</p>
<p>So if you can&#8217;t use the credentials of a real user, what do you do? These days, there are two main options: machine

user credentials and automatically-provisioned credentials. These are the topics of the next two sections.</p>

</div>

Expand Down Expand Up @@ -2622,14 +2616,6 @@ <h3 id="_machine_user_credentials_and_automatically_provisioned_credentials">Mac

</div>

<div class="paragraph">

<p>What are machine user credentials or automatically-provisioned credentials? These are the topics of the next two

sections.</p>

</div>

<div class="sect4">

<h4 id="_machine_user_credentials">Machine user credentials</h4>
Expand Down Expand Up @@ -3620,9 +3606,17 @@ <h2 id="_continuous_delivery_cd">Continuous Delivery (CD)</h2>

<div class="paragraph">

<p><em>Continuous delivery (CD)</em> is a software development practice which is software development practice with the following
<p><em>Continuous delivery (CD)</em> is a software development practice which is software development practice where you ensure

that you can deploy to production at any time in a manner that is fast, reliable, and sustainable. You could choose to

deploy daily, several times a day, thousands of times per day, or even after every single commit that passes the

automated tests; this last approach is known as <em>continuous deployment</em>. But the key with CD is not how often you

deploy, but to ensure that the frequency of deployment is purely a business decision—not something limited by your

key property:</p>
technology.</p>

</div>

Expand All @@ -3644,7 +3638,7 @@ <h2 id="_continuous_delivery_cd">Continuous Delivery (CD)</h2>

<div class="paragraph">

<p>You can deploy to production at any time in a manner that is fast, reliable, and sustainable.</p>
<p>Ensure you can deploy to production at any time in a manner that is fast, reliable, and sustainable.</p>

</div>

Expand All @@ -3658,18 +3652,6 @@ <h2 id="_continuous_delivery_cd">Continuous Delivery (CD)</h2>

<div class="paragraph">

<p>You could choose to deploy daily, several times a day, thousands of times per day, or even after every single commit

that passes the automated tests; this last approach is known as <em>continuous deployment</em>. But the key with CD is not how

often you deploy, but to ensure that the frequency of deployment is purely a business decision—not something limited by

your technology.</p>

</div>

<div class="paragraph">

<p>If you&#8217;re used to a painful deploy process that happens only once every few weeks or months, then deploying many times

per day may sound like a nightmare—and deploying thousands of times per day probably sounds utterly impossible. But
Expand Down Expand Up @@ -7494,7 +7476,7 @@ <h2 id="_conclusion_5">Conclusion</h2>

<li>

<p>All developers merge all their work together on a regular basis: typically daily or multiple times per day.</p>
<p>Ensure all developers merge all their work together on a regular basis: typically daily or multiple times per day.</p>

</li>

Expand Down Expand Up @@ -7522,7 +7504,7 @@ <h2 id="_conclusion_5">Conclusion</h2>

<li>

<p>You can deploy to production at any time in a manner that is fast, reliable, and sustainable.</p>
<p>Ensure you can deploy to production at any time in a manner that is fast, reliable, and sustainable.</p>

</li>

Expand Down
Binary file modified docs/images/ch1/architecture-evolution-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ch1/architecture-evolution-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 96a0612

Please sign in to comment.