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 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 diff --git a/lesson_5_build/ex2.md b/lesson_5_build/ex2.md index 92f1c8e..b901b4a 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