From 88fa79fff265cea8c8fbe7a08f200f1e89916fac Mon Sep 17 00:00:00 2001
From: cesarsantiagonunez
 <86664126+cesarsantiagonunez@users.noreply.github.com>
Date: Thu, 10 Nov 2022 20:45:50 +0100
Subject: [PATCH 1/5] Dockerfile.ex1 solution

---
 lesson_5_build/Dockerfile.ex1 | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/lesson_5_build/Dockerfile.ex1 b/lesson_5_build/Dockerfile.ex1
index 3e39b12..914b80f 100644
--- a/lesson_5_build/Dockerfile.ex1
+++ b/lesson_5_build/Dockerfile.ex1
@@ -1,12 +1,9 @@
-FROM
-
-LABEL
-ENV
-EXPOSE
-
-ADD
-COPY
-RUN
-
+FROM nginx:1.22.1
 
+LABEL author=CMSN
+ENV LESSON_NUMBER=5
+EXPOSE 80
 
+RUN mv /etc/nginx/nginx.conf /etc/nginx/default.conf
+COPY ex1.conf /etc/nginx/nginx.conf
+COPY ex1_web.html /var/www/index.html

From 901234bcd3e73099fdf1eeee4a8ccdf1ffa98b94 Mon Sep 17 00:00:00 2001
From: cesarsantiagonunez
 <86664126+cesarsantiagonunez@users.noreply.github.com>
Date: Thu, 10 Nov 2022 20:46:03 +0100
Subject: [PATCH 2/5] ex1_solution

---
 lesson_5_build/ex1_solution.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lesson_5_build/ex1_solution.md b/lesson_5_build/ex1_solution.md
index 8f417ad..489ecc5 100644
--- a/lesson_5_build/ex1_solution.md
+++ b/lesson_5_build/ex1_solution.md
@@ -1,4 +1,11 @@
 ### Port 80 content
+Welcome to nginx!
+If you see this page, the nginx web server is successfully installed and working. Further configuration is required.
 
+For online documentation and support please refer to nginx.org.
+Commercial support is available at nginx.com.
 
-#### Port 8888 content
\ No newline at end of file
+Thank you for using nginx.
+
+#### Port 8888 content
+Docker course lesson 5

From 4298daef47c3bc8c96f91a0c1bf0acda19717ac9 Mon Sep 17 00:00:00 2001
From: cesarsantiagonunez
 <86664126+cesarsantiagonunez@users.noreply.github.com>
Date: Thu, 10 Nov 2022 20:56:39 +0100
Subject: [PATCH 3/5] Dockerfile.ex2 proposal

---
 lesson_5_build/ex2.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lesson_5_build/ex2.md b/lesson_5_build/ex2.md
index 92f1c8e..3991cce 100644
--- a/lesson_5_build/ex2.md
+++ b/lesson_5_build/ex2.md
@@ -11,3 +11,6 @@ Edit the Dockerfile and/or write below your thoughts. Open a pull request with y
 
 ### Your changes
 
+Combine lines 4 and 5
+Replace line 8 with **ADD hello.zip**
+Remove line 10

From 8a18154410072c667225fc0fb269590ebdc2f760 Mon Sep 17 00:00:00 2001
From: cesarsantiagonunez
 <86664126+cesarsantiagonunez@users.noreply.github.com>
Date: Thu, 10 Nov 2022 20:57:37 +0100
Subject: [PATCH 4/5] corrected format

---
 lesson_5_build/ex2.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lesson_5_build/ex2.md b/lesson_5_build/ex2.md
index 3991cce..78ad495 100644
--- a/lesson_5_build/ex2.md
+++ b/lesson_5_build/ex2.md
@@ -11,6 +11,6 @@ Edit the Dockerfile and/or write below your thoughts. Open a pull request with y
 
 ### Your changes
 
-Combine lines 4 and 5
-Replace line 8 with **ADD hello.zip**
-Remove line 10
+-Combine lines 4 and 5
+-Replace line 8 with **ADD hello.zip**
+-Remove line 10

From 0018afb4b1d048060adb6b1f2c3ac739185a3a83 Mon Sep 17 00:00:00 2001
From: cesarsantiagonunez
 <86664126+cesarsantiagonunez@users.noreply.github.com>
Date: Thu, 10 Nov 2022 20:58:19 +0100
Subject: [PATCH 5/5] corrected format

---
 lesson_5_build/ex2.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lesson_5_build/ex2.md b/lesson_5_build/ex2.md
index 78ad495..b901b4a 100644
--- a/lesson_5_build/ex2.md
+++ b/lesson_5_build/ex2.md
@@ -11,6 +11,6 @@ Edit the Dockerfile and/or write below your thoughts. Open a pull request with y
 
 ### Your changes
 
--Combine lines 4 and 5
--Replace line 8 with **ADD hello.zip**
--Remove line 10
+- Combine lines 4 and 5
+- Replace line 8 with **ADD hello.zip**
+- Remove line 10