Introduced two new labs in module2.

1 year ago · 6364a495f6
parent 379c889595
commit 6364a495f6
58 changed files with 4 additions and 2 deletions
--- a/module2/07_docker_containerization_basics/cats-app/app.py
+++ b/module2/07_docker_containerization_basics/cats-app/app.py
--- a/module2/07_docker_containerization_basics/cats-app/requirements.txt
+++ b/module2/07_docker_containerization_basics/cats-app/requirements.txt
--- a/module2/07_docker_containerization_basics/cats-app/templates/index.html
+++ b/module2/07_docker_containerization_basics/cats-app/templates/index.html
--- a/module2/07_docker_containerization_basics/foodtrucks-app/build_and_run.sh
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/build_and_run.sh
--- a/module2/07_docker_containerization_basics/foodtrucks-app/docker-compose.yml
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/docker-compose.yml
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/.babelrc
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/.babelrc
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/app.py
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/app.py
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package-lock.json
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package-lock.json
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package.json
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package.json
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/requirements.txt
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/requirements.txt
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js.map
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js.map
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/favicon.ico
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/favicon.ico
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-144x144.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-144x144.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-192x192.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-192x192.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-36x36.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-36x36.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-48x48.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-48x48.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-72x72.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-72x72.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-96x96.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-96x96.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-114x114.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-114x114.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-120x120.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-120x120.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-144x144.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-144x144.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-152x152.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-152x152.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-180x180.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-180x180.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-57x57.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-57x57.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-60x60.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-60x60.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-72x72.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-72x72.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-76x76.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-76x76.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-precomposed.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-precomposed.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/browserconfig.xml
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/browserconfig.xml
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-16x16.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-16x16.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-32x32.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-32x32.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-96x96.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-96x96.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon.ico
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon.ico
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/manifest.json
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/manifest.json
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-144x144.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-144x144.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-150x150.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-150x150.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-310x310.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-310x310.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-70x70.png
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-70x70.png
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/app.js
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/app.js
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Intro.js
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Intro.js
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Sidebar.js
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Sidebar.js
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Vendor.js
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Vendor.js
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/styles/main.css
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/styles/main.css
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/templates/index.html
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/templates/index.html
--- a/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/webpack.config.js
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/webpack.config.js
--- a/module2/07_docker_containerization_basics/foodtrucks-app/utils/generate_geojson.py
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/utils/generate_geojson.py
--- a/module2/07_docker_containerization_basics/foodtrucks-app/utils/trucks.geojson
+++ b/module2/07_docker_containerization_basics/foodtrucks-app/utils/trucks.geojson
--- a/module2/07_docker_containerization_basics/lection.md
+++ b/module2/07_docker_containerization_basics/lection.md
--- a/module2/07_docker_containerization_basics/questions.md
+++ b/module2/07_docker_containerization_basics/questions.md
--- a/module2/07_docker_containerization_basics/tasks.md
+++ b/module2/07_docker_containerization_basics/tasks.md
--- a/module2/08_docker_containerization_advanced/.gitkeep
+++ b/module2/08_docker_containerization_advanced/.gitkeep
--- a/module2/09_ansible/lection.md
+++ b/module2/09_ansible/lection.md
--- a/module2/09_ansible/questions.md
+++ b/module2/09_ansible/questions.md
--- a/module2/09_ansible/tasks.md
+++ b/module2/09_ansible/tasks.md
--- a/module2/10_monitoring_basics/.gitkeep
+++ b/module2/10_monitoring_basics/.gitkeep
--- a/timing.md
+++ b/timing.md
@ -41,7 +41,9 @@
 | [04_postfix_dovecot](./module2/04_postfix_dovecot/)                                | 4                                | 16                                 |
 | [05_sql_postgresql](./module2/05_sql_postgresql/)                                 | 4                                | 0                                  |
 | [06_virtualization](./module2/06_virtualization/)                                 | 4                                | 16                                 |
-| [07_containerization_docker](./module2/07_containerization_docker/)                        | 4                                | 16                                 |
+| [07_docker_containerization_basics](./module2/07_docker_containerization_basics/)                        | 4                                | 8                                 |
-| [08_ansible](./module2/08_ansible/)                                        | 4                                | 8                                  |
+| [08_docker_containerization_advanced](./module2/08_docker_containerization_advanced/)                        | 4                                | 16                                 |
 | [09_ansible](./module2/09_ansible/)                                        | 4                                | 8                                  |
 | [10_monitoring_basics](./module2/10_monitoring_basics/)                                        | 4                                | 8                                  |
 | Обсуждение результатов тестов, ответы на вопросы | 4                                | 0                                  |
 | [final_exam](./module2/final_exam/)                                        | 4                                | 8                                  |