Reorganized labs AsciiDoc source files for easier stitching. (#17)

* Reorganized labs AsciiDoc source files for easier stitching. * Added generated PDF. * Script for stitching lab guide together.
vmware-archive · Oct 9, 2017 · c8d86cc · c8d86cc
1 parent 0020491
commit c8d86cc
Show file tree

Hide file tree

Showing 25 changed files with 58 additions and 2 deletions.
diff --git a/labs/00/README.adoc → labs/00-introduction_to_cli.adoc b/labs/00/README.adoc → labs/00-introduction_to_cli.adoc
diff --git a/labs/01/README.adoc → ...1-building_a_spring_boot_application.adoc b/labs/01/README.adoc → ...1-building_a_spring_boot_application.adoc
diff --git a/labs/02/README.adoc → ...ding_persistence_to_boot_application.adoc b/labs/02/README.adoc → ...ding_persistence_to_boot_application.adoc
@@ -118,7 +118,7 @@ Next we'll import some data.
 
 == Importing Data
 
-. Add this https://raw.githubusercontent.com/Pivotal-Field-Engineering/devops-workshop-boeing/master/labs/02/import.sql[import.sql] file found in *devops-workshop-boeing/labs/02* to +src/main/resources+. This is a rather large dataset containing all of the postal codes in the United States and its territories. This file will automatically be picked up by http://hibernate.org/orm/what-is-an-orm/[Hibernate] and imported into the in-memory database.
+. Add this https://raw.githubusercontent.com/Pivotal-Field-Engineering/devops-workshop-boeing/master/labs/import.sql[import.sql] file found in *devops-workshop-boeing/labs/* to +src/main/resources+. This is a rather large dataset containing all of the postal codes in the United States and its territories. This file will automatically be picked up by http://hibernate.org/orm/what-is-an-orm/[Hibernate] and imported into the in-memory database.
 
 . Restart the application.
 +

diff --git a/labs/03/README.adoc → ...ancing_boot_application_with_metrics.adoc b/labs/03/README.adoc → ...ancing_boot_application_with_metrics.adoc
diff --git a/labs/04/README.adoc → ...ing_cloud_config_to_boot_application.adoc b/labs/04/README.adoc → ...ing_cloud_config_to_boot_application.adoc
diff --git a/labs/05/README.adoc → ...tion_and_discovery_with_spring_cloud.adoc b/labs/05/README.adoc → ...tion_and_discovery_with_spring_cloud.adoc
diff --git a/labs/06/README.adoc → labs/06-employing_a_circuit_breaker.adoc b/labs/06/README.adoc → labs/06-employing_a_circuit_breaker.adoc
@@ -99,7 +99,7 @@ cf start cloud-native-spring
 
 . Refresh the UI app and you should once again see a table listing the first page of cities.
 +
-image::../lab05/images/ui.jpg[]
+image::images/ui.jpg[]
 
 . Refresh your UI application a few times to force some traffic though the circuit breaker call path.  After doing this you should now see the dashboard populated with metrics about the health of your Hystrix circuit breaker:
 +

diff --git a/labs/devops-workshop-lab-guide.adoc b/labs/devops-workshop-lab-guide.adoc
@@ -0,0 +1,52 @@
+:title: DevOps Workshop Lab Guide
+:author: Christopher Phillipson
+:email: cphillipson@pivotal.io
+:revnumber: 1.0
+:revdate: {docdate}
+:revyear: 2017
+:subject: DevOps Workshop
+:keywords: DevOps, Spring Boot, Spring Cloud
+
+= DevOps Workshop Lab Guide
+
+toc::[]
+
+:leveloffset: +1
+
+<<<
+
+include::introduction.adoc[]
+
+<<<
+
+include::00-introduction_to_cli.adoc[]
+
+<<<
+
+include::01-building_a_spring_boot_application.adoc[]
+
+<<<
+
+include::02-adding_persistence_to_boot_application.adoc[]
+
+<<<
+
+include::03-enhancing_boot_application_with_metrics.adoc[]
+
+<<<
+
+include::04-adding_spring_cloud_config_to_boot_application.adoc[]
+
+<<<
+
+include::05-adding_service_registration_and_discovery_with_spring_cloud.adoc[]
+
+<<<
+
+include::06-employing_a_circuit_breaker.adoc[]
+
+<<<
+
+:leveloffset: -1
+
+
diff --git a/labs/devops-workshop-lab-guide.pdf b/labs/devops-workshop-lab-guide.pdf
diff --git a/labs/generate-lab-guide.sh b/labs/generate-lab-guide.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+asciidoctor-pdf -a toc -b pdf devops-workshop-lab-guide.adoc
+
diff --git a/labs/03/images/appsman.jpg → labs/images/appsman.jpg b/labs/03/images/appsman.jpg → labs/images/appsman.jpg
diff --git a/...d-compare-lab03-to-lab04-build.gradle.png → ...d-compare-lab03-to-lab04-build.gradle.png b/...d-compare-lab03-to-lab04-build.gradle.png → ...d-compare-lab03-to-lab04-build.gradle.png
diff --git a/labs/04/images/config-scs.jpg → labs/images/config-scs.jpg b/labs/04/images/config-scs.jpg → labs/images/config-scs.jpg
diff --git a/labs/04/images/config-scs1.jpg → labs/images/config-scs1.jpg b/labs/04/images/config-scs1.jpg → labs/images/config-scs1.jpg
diff --git a/labs/04/images/config-scs2.jpg → labs/images/config-scs2.jpg b/labs/04/images/config-scs2.jpg → labs/images/config-scs2.jpg
diff --git a/labs/04/images/config-scs3.jpg → labs/images/config-scs3.jpg b/labs/04/images/config-scs3.jpg → labs/images/config-scs3.jpg
diff --git a/labs/06/images/dash.jpg → labs/images/dash.jpg b/labs/06/images/dash.jpg → labs/images/dash.jpg
diff --git a/labs/06/images/dash1.jpg → labs/images/dash1.jpg b/labs/06/images/dash1.jpg → labs/images/dash1.jpg
diff --git a/labs/06/images/empty.jpg → labs/images/empty.jpg b/labs/06/images/empty.jpg → labs/images/empty.jpg
diff --git a/labs/03/images/logging.jpg → labs/images/logging.jpg b/labs/03/images/logging.jpg → labs/images/logging.jpg
diff --git a/labs/05/images/registry1.jpg → labs/images/registry1.jpg b/labs/05/images/registry1.jpg → labs/images/registry1.jpg
diff --git a/labs/05/images/registry2.jpg → labs/images/registry2.jpg b/labs/05/images/registry2.jpg → labs/images/registry2.jpg
diff --git a/labs/05/images/ui.jpg → labs/images/ui.jpg b/labs/05/images/ui.jpg → labs/images/ui.jpg
diff --git a/labs/02/import.sql → labs/import.sql b/labs/02/import.sql → labs/import.sql
diff --git a/labs/README.adoc → labs/introduction.adoc b/labs/README.adoc → labs/introduction.adoc