Skip to content

Commit 159cf03

Browse files
authored
Merge pull request #11 from nginxinc/sd
Docker cleanup steps added to all labs
2 parents fd5dfb0 + 381d877 commit 159cf03

File tree

8 files changed

+88
-14
lines changed

8 files changed

+88
-14
lines changed

labs/lab1/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Visual Studio Code | Docker Compose | GitHub
100100
1. Run Docker Compose to build and run your NGINX OSS container:
101101

102102
```bash
103-
cd labs/lab1
103+
cd lab1
104104
docker-compose up --force-recreate
105105
106106
```

labs/lab2/readme.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Go ahead and try some of these NGINX commands in your nginx-oss container now, s
143143
1. Run Docker Compose to build and run your NGINX OSS container:
144144

145145
```bash
146-
cd labs/lab2
146+
cd lab2
147147
docker-compose up --force-recreate
148148
```
149149

@@ -1035,6 +1035,20 @@ In this exercise, you will learn about NGINX logging. There are only 2 logs tha
10351035
10361036
<br/>
10371037
1038+
>If you are finished with this lab, you can use Docker Compose to shut down your test environment:
1039+
1040+
```bash
1041+
docker-compose down
1042+
```
1043+
1044+
```bash
1045+
##Sample output##
1046+
Running 2/2
1047+
Container nginx-oss Removed
1048+
Network lab2_default Removed
1049+
1050+
```
1051+
10381052
**This completes Lab2.**
10391053
10401054
<br/>

labs/lab3/readme.md

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44

55
In this Lab, NGINX as a webserver with HTTPS TLS termination will be introduced. HTTPS is commonly used to secure a website with encryption, so that data sent between the browser and the NGINX server cannot be easily read like clear text HTTP. You will explore common TLS configuration directives and variables, to provide encryption for your traffic. You will also explore some common tools to create and test TLS encryption components.
66

7-
## Learning Objectives
7+
## Learning Objectives
88

9-
By the end of the lab you will be able to:
10-
* Create a Self-signed TLS certificate and key
11-
* Configure NGINX webserver to use a TLS cert and key
12-
* Configure TLS settings
13-
* Add some TLS Best Practice configurations
14-
* Test and validate TLS traffic components and settings
9+
By the end of the lab you will be able to:
10+
11+
- Create a Self-signed TLS certificate and key
12+
- Configure NGINX webserver to use a TLS cert and key
13+
- Configure TLS settings
14+
- Add some TLS Best Practice configurations
15+
- Test and validate TLS traffic components and settings
1516

1617
</br>
1718

@@ -34,12 +35,19 @@ In this exercise, you will use `openssl` to create a Self-signed certificate and
3435

3536
<br/>
3637

37-
![Openssl](media/openssl-logo.png)
38+
![Openssl](media/openssl-logo.png)
3839

3940
<br/>
4041

4142
1. Ensure you are in the `lab3` folder. Using a Terminal, use Docker Compose to build and run the `nginx-oss` container. This is a new image, based on the Dockerfile in the lab3 folder. The `openssl` libraries have been added, so you can use them to build, configure, and test TLS. Optionally, you can use `openssl` if it is installed on your local machine.
4243

44+
1. Run Docker Compose to build and run your containers:
45+
46+
```bash
47+
cd lab3
48+
docker-compose up --force-recreate
49+
```
50+
4351
1. After the Docker Compose has completed, and the lab3/nginx-oss container is running, Docker Exec into the nginx-oss container.
4452

4553
```bash
@@ -96,6 +104,7 @@ In this exercise, you will use `openssl` to create a Self-signed certificate and
96104
-----END CERTIFICATE-----
97105
98106
```
107+
99108
```bash
100109
/etc/ssl/nginx $ cat cars.example.com.key
101110
```
@@ -827,6 +836,20 @@ As a Best Practice, you should not modify the `main` log format, but rather copy
827836
828837
>Don't forget - Save any Docker containers/images, docker compose, NGINX config files and Notes you may want for future reference.
829838
839+
>If you are finished with this lab, you can use Docker Compose to shut down your test environment:
840+
841+
```bash
842+
docker-compose down
843+
```
844+
845+
```bash
846+
##Sample output##
847+
Running 2/2
848+
Container nginx-oss Removed
849+
Network lab3_default Removed
850+
851+
```
852+
830853
### Summary
831854
832855
In this lab, you learned the following NGINX / Docker topics.
@@ -857,6 +880,7 @@ In this lab, you learned the following NGINX / Docker topics.
857880
<br/>
858881
859882
### Authors
883+
860884
- Chris Akker - Solutions Architect - Community and Alliances @ F5, Inc.
861885
- Shouvik Dutta - Solutions Architect - Community and Alliances @ F5, Inc.
862886

labs/lab4/readme.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For this lab you will build/run 4 Docker containers. The first one will be used
9595
1. Run Docker Compose to build and run your containers:
9696

9797
```bash
98-
cd labs/lab4
98+
cd lab4
9999
docker-compose up --force-recreate
100100
```
101101

@@ -1113,6 +1113,23 @@ If you need to find the `answers` to the lab exercises, you will find the final
11131113
11141114
![NGINX Logo](media/nginx-logo.png)
11151115
1116+
>If you are finished with this lab, you can use Docker Compose to shut down your test environment:
1117+
1118+
```bash
1119+
docker-compose down
1120+
```
1121+
1122+
```bash
1123+
##Sample output##
1124+
Running 5/5
1125+
Container nginx-oss Removed
1126+
Container web2 Removed
1127+
Container web3 Removed
1128+
Container web1 Removed
1129+
Network lab4_default Removed
1130+
1131+
```
1132+
11161133
**This completes Lab4.**
11171134
11181135
<br/>
@@ -1133,6 +1150,7 @@ If you need to find the `answers` to the lab exercises, you will find the final
11331150
<br/>
11341151
11351152
### Authors
1153+
11361154
- Chris Akker - Solutions Architect - Community and Alliances @ F5, Inc.
11371155
- Shouvik Dutta - Solutions Architect - Community and Alliances @ F5, Inc.
11381156

labs/lab5/readme.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ NGINX Plus is the `Commercial version of NGINX`, adding additional Enterprise fe
114114
1. Build and run all the above containers by using docker compose.
115115

116116
```bash
117-
docker compose up
117+
cd lab5
118+
docker compose up --force-recreate
118119
```
119120

120121
1. Verify all four containers are running:
@@ -730,6 +731,23 @@ In this section, you will make use of NGINX Plus API to get current statistics r
730731
curl 'http://localhost:9000/api/9/http/upstreams' | jq
731732
```
732733
734+
>If you are finished with this lab, you can use Docker Compose to shut down your test environment:
735+
736+
```bash
737+
docker-compose down
738+
```
739+
740+
```bash
741+
##Sample output##
742+
Running 5/5
743+
Container nginx-plus Removed
744+
Container web2 Removed
745+
Container web3 Removed
746+
Container web1 Removed
747+
Network lab5_default Removed
748+
749+
```
750+
733751
**This completes Lab 5.**
734752
735753
## References

labs/media/basics-workshop-banner.png

119 KB
Loading

labs/media/nginx-workshop-desk.png

69.4 KB
Loading

labs/readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![NGINX NIC](../media/basics-workshop-banner.png)
1+
![NGINX NIC](media/basics-workshop-banner.png)
22

33
## NGINX Basics Workshop
44

@@ -16,7 +16,7 @@ You will learn about `NGINX` Opensource Software (OSS) and `NGINX Plus`, the Com
1616

1717
<br/>
1818

19-
![NGINXpert Desk](../media/nginx-workshop-desk.png)
19+
![NGINXpert Desk](media/nginx-workshop-desk.png)
2020

2121
<br/>
2222

0 commit comments

Comments
 (0)