diff --git a/module2/07_containerization_docker/cats-app/app.py b/module2/07_docker_containerization_basics/cats-app/app.py similarity index 100% rename from module2/07_containerization_docker/cats-app/app.py rename to module2/07_docker_containerization_basics/cats-app/app.py diff --git a/module2/07_containerization_docker/cats-app/requirements.txt b/module2/07_docker_containerization_basics/cats-app/requirements.txt similarity index 100% rename from module2/07_containerization_docker/cats-app/requirements.txt rename to module2/07_docker_containerization_basics/cats-app/requirements.txt diff --git a/module2/07_containerization_docker/cats-app/templates/index.html b/module2/07_docker_containerization_basics/cats-app/templates/index.html similarity index 100% rename from module2/07_containerization_docker/cats-app/templates/index.html rename to module2/07_docker_containerization_basics/cats-app/templates/index.html diff --git a/module2/07_containerization_docker/foodtrucks-app/build_and_run.sh b/module2/07_docker_containerization_basics/foodtrucks-app/build_and_run.sh similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/build_and_run.sh rename to module2/07_docker_containerization_basics/foodtrucks-app/build_and_run.sh diff --git a/module2/07_containerization_docker/foodtrucks-app/docker-compose.yml b/module2/07_docker_containerization_basics/foodtrucks-app/docker-compose.yml similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/docker-compose.yml rename to module2/07_docker_containerization_basics/foodtrucks-app/docker-compose.yml diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/.babelrc b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/.babelrc similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/.babelrc rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/.babelrc diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/app.py b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/app.py similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/app.py rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/app.py diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/package-lock.json b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package-lock.json similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/package-lock.json rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package-lock.json diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/package.json b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package.json similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/package.json rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/package.json diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/requirements.txt b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/requirements.txt similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/requirements.txt rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/requirements.txt diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/build/main.js b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/build/main.js rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/build/main.js.map b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js.map similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/build/main.js.map rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/build/main.js.map diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/favicon.ico b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/favicon.ico similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/favicon.ico rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/favicon.ico diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/android-icon-144x144.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-144x144.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/android-icon-192x192.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-192x192.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/android-icon-36x36.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-36x36.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/android-icon-48x48.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-48x48.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/android-icon-72x72.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-72x72.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/android-icon-96x96.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/android-icon-96x96.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-114x114.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-114x114.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-120x120.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-120x120.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-144x144.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-144x144.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-152x152.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-152x152.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-180x180.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-180x180.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-57x57.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-57x57.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-60x60.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-60x60.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-72x72.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-72x72.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-76x76.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-76x76.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon-precomposed.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon-precomposed.png diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon.png b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon.png similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/apple-icon.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/apple-icon.png diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/browserconfig.xml b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/browserconfig.xml similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/browserconfig.xml rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/browserconfig.xml diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon-16x16.png b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-16x16.png similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon-16x16.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-16x16.png diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon-32x32.png b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-32x32.png similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon-32x32.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-32x32.png diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon-96x96.png b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-96x96.png similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon-96x96.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon-96x96.png diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon.ico b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon.ico similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/favicon.ico rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/favicon.ico diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/manifest.json b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/manifest.json similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/manifest.json rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/manifest.json diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/ms-icon-144x144.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-144x144.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/ms-icon-150x150.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-150x150.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/ms-icon-310x310.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-310x310.png diff --git a/module2/07_containerization_docker/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 similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/icons/ms-icon-70x70.png rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/icons/ms-icon-70x70.png diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/app.js b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/app.js similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/app.js rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/app.js diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/components/Intro.js b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Intro.js similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/components/Intro.js rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Intro.js diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/components/Sidebar.js b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Sidebar.js similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/components/Sidebar.js rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Sidebar.js diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/components/Vendor.js b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Vendor.js similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/src/components/Vendor.js rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/src/components/Vendor.js diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/static/styles/main.css b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/styles/main.css similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/static/styles/main.css rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/static/styles/main.css diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/templates/index.html b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/templates/index.html similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/templates/index.html rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/templates/index.html diff --git a/module2/07_containerization_docker/foodtrucks-app/flask-app/webpack.config.js b/module2/07_docker_containerization_basics/foodtrucks-app/flask-app/webpack.config.js similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/flask-app/webpack.config.js rename to module2/07_docker_containerization_basics/foodtrucks-app/flask-app/webpack.config.js diff --git a/module2/07_containerization_docker/foodtrucks-app/utils/generate_geojson.py b/module2/07_docker_containerization_basics/foodtrucks-app/utils/generate_geojson.py similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/utils/generate_geojson.py rename to module2/07_docker_containerization_basics/foodtrucks-app/utils/generate_geojson.py diff --git a/module2/07_containerization_docker/foodtrucks-app/utils/trucks.geojson b/module2/07_docker_containerization_basics/foodtrucks-app/utils/trucks.geojson similarity index 100% rename from module2/07_containerization_docker/foodtrucks-app/utils/trucks.geojson rename to module2/07_docker_containerization_basics/foodtrucks-app/utils/trucks.geojson diff --git a/module2/07_containerization_docker/lection.md b/module2/07_docker_containerization_basics/lection.md similarity index 100% rename from module2/07_containerization_docker/lection.md rename to module2/07_docker_containerization_basics/lection.md diff --git a/module2/07_containerization_docker/questions.md b/module2/07_docker_containerization_basics/questions.md similarity index 100% rename from module2/07_containerization_docker/questions.md rename to module2/07_docker_containerization_basics/questions.md diff --git a/module2/07_containerization_docker/tasks.md b/module2/07_docker_containerization_basics/tasks.md similarity index 100% rename from module2/07_containerization_docker/tasks.md rename to module2/07_docker_containerization_basics/tasks.md diff --git a/module2/08_docker_containerization_advanced/.gitkeep b/module2/08_docker_containerization_advanced/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/module2/08_ansible/lection.md b/module2/09_ansible/lection.md similarity index 100% rename from module2/08_ansible/lection.md rename to module2/09_ansible/lection.md diff --git a/module2/08_ansible/questions.md b/module2/09_ansible/questions.md similarity index 100% rename from module2/08_ansible/questions.md rename to module2/09_ansible/questions.md diff --git a/module2/08_ansible/tasks.md b/module2/09_ansible/tasks.md similarity index 100% rename from module2/08_ansible/tasks.md rename to module2/09_ansible/tasks.md diff --git a/module2/10_monitoring_basics/.gitkeep b/module2/10_monitoring_basics/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/timing.md b/timing.md index bc65e21..12b394d 100644 --- 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 | -| [08_ansible](./module2/08_ansible/) | 4 | 8 | +| [07_docker_containerization_basics](./module2/07_docker_containerization_basics/) | 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 | \ No newline at end of file