259: Review of DOB.

liatrio · Apr 5, 2023 · b43d9c9 · b43d9c9
1 parent c5dd8cd
commit b43d9c9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/1-introduction/1.2-liatrio-and-devops.md b/1-introduction/1.2-liatrio-and-devops.md
@@ -21,7 +21,7 @@ Liatrio is a boots-on-the-ground DevOps Consulting group, meaning that our teams
 
 ## The Rise of DevOps
 
-DevOps has revolutionized software development within the last couple decades. At the turn of the century, it was common that development teams would work on independent pieces of a project, which would ultimately have to be merged and compiled by a tech lead at the end of a project. This lead to an enormous problem. If code didn't merge together and function as expected, a team might not know until very late in the development process, or even until after deploying. Since that time, developers have created processes and tools to help build, test, and manage code throughout the life of a project. Those tools and processes help form the foundation of what we know today as DevOps.
+DevOps has revolutionized software development within the last couple decades. At the turn of the century, it was common that development teams would work on independent pieces of a project, which would ultimately have to be merged and compiled by a tech lead at the end of a project. This led to an enormous problem. If code didn't merge together and function as expected, a team might not know until very late in the development process, or even until after deploying. Since that time, developers have created processes and tools to help build, test, and manage code throughout the life of a project. Those tools and processes help form the foundation of what we know today as DevOps.
 
 ## The Goals
 DevOps practices aim to take the pain out of software delivery and deployment.

diff --git a/1-introduction/1.2.1-dojo.md b/1-introduction/1.2.1-dojo.md
@@ -1,8 +1,8 @@
 # What is the dojo?
 A dōjō (道場) is a Japanese word for a space focused on immersive learning. At its core, the Dojo is a cultural movement focused on helping organizations improve and accelerate their software delivery.
 Teams and leaders leave the Dojo experience motivated and excited after applying modern software delivery techniques to their own product.
-The Dojo provides an immersive, hands on experience that improves a team’s way of thinking and working so that organizations can deliver products faster to customers. This dedicated experience and immersive learning helps organization to improve on
-* Culture: Enables a change in mindset and behaviours for both the delivery teams and their leadership.
+The Dojo provides an immersive, hands on experience that improves a team’s way of thinking and working so that organizations can deliver products faster to customers. This dedicated experience and immersive learning helps organizations to improve upon:
+* Culture: Enables a change in mindset and behaviors for both the delivery teams and their leadership.
 * Practices: Learn new technical and non-technical practices, apply and reinforce knowledge to shift teams toward modern ways of working.
 * Experimentation: Immersive, distraction free environment that allows teams to apply experiments and learnings by failing early and fast.
 The best learning and growth happens only when people apply newly gained skills to their product backlog and are able to break past existing organizational constraints.
diff --git a/1-introduction/1.3.1-unix.md b/1-introduction/1.3.1-unix.md
@@ -1,5 +1,5 @@
 # Unix Basics
-Unix us used as a generic term to refer to Unix like operating systems (i.e. Linux, BSD, MacOS). Windows is not a Unix operating system, but has Windows Subsystem for Linux (WSL) to provide Unix functionality on Windows computers.
+Unix is used as a generic term to refer to Unix like operating systems (i.e. Linux, BSD, MacOS). Windows is not a Unix operating system, but has Windows Subsystem for Linux (WSL) to provide Unix functionality on Windows computers.
 
 # Learning The Command Line
 

diff --git a/Dockerfile b/Dockerfile
@@ -9,6 +9,9 @@ ENV PORT 3000
 ENV DOCSIFY_VERSION latest
 ENV NODE_VERSION alpine
 
+# Copy docsify files
+COPY . /usr/local/docsify
+
 ## Container runtime configuration
 EXPOSE 3000
 WORKDIR /usr/local/docsify
@@ -18,4 +21,3 @@ ENTRYPOINT [ "docsify", "serve", "--port", "3000" ]
 
 ## Container entry point default arguments
 CMD [ "." ]
-
diff --git a/README.md b/README.md
@@ -39,14 +39,15 @@ This bootcamp alone will by no means make anyone an expert on DevOps; that's whe
 This bootcamp was adapted from an apprentice training program, and some mistakes may have slipped through the cracks. If you see any errors, outdated methods, or citation errors please submit a pull request.
 
 ## Local Development
+Below are a number of ways to develop locally, choose whichever you are most comfortable with. 
 
 ### Using Package.json **Recommended**
 
 Install Docsify locally (in current directory)
 
 1. Run `npm install`
-1. Run `npm start`
-1. Open <http://localhost:3000>
+2. Run `npm start`
+3. Open <http://localhost:3000>
 
 ### Global Install
 
@@ -57,29 +58,27 @@ Install Docsify Globally in your system
 3. Run `docsify serve .`
 4. Open <http://localhost:3000>
 
-### Build Docker Container
+### Docker
 
-Execute the following commands from the project's root directory to generate a container image.
+Use Docker to build and serve the content, but remember to rebuild the Docker image to review changes
 
-```shell
-# Build Docker Image
-docker build . -t devops-bootcamp
-```
+#### Build and Run Docker Container
 
-### Running Docker Container
+1. Execute `docker build . -t devops-bootcamp` from the project's root directory to generate a container image
+2. Run `docker run -d -p 3000:3000 --name devops-bootcamp devops-bootcamp` to run a detached Docker container
+3. Open <http://localhost:3000>
 
-```shell
-# Running Docker Container Detached
-docker run -d -p 3000:3000 --name devops-bootcamp devops-bootcamp
-```
+#### Docker Compose
+
+1. Run `docker compose up -d`
+2. Open <http://localhost:3000>
 
 ### Contributing
 
 - Images should be placed under the root `img` folder and referred to using HTML `<img>` tags
 - H3 header (`###`) should be the default header within a page
 - H2 header (`##`) will appear in the navigation as the page's table of contents
 
-
 [Contributors](contributors.md)
 
 ![](img/class_light.svg ':size=100x100 :class=light-mode-icon')

diff --git a/_sidebar.md b/_sidebar.md
@@ -6,7 +6,7 @@
   ><label for="dark_mode_switch">Toggle</label
   ><i class="fas fa-moon"></i></div>
 
-- [Introduction](/)
+- [Welcome](/)
 * **Chapter 1**
 - [1.0 - Introduction to DevOps](1-introduction/1.0-overview.md)
 - [1.1 - DevOps Defined](1-introduction/1.1-devops-defined.md)