From d13a7e2c0b17f8fe43c263baaa4a91958d38e47e Mon Sep 17 00:00:00 2001 From: Khalitova Angelina Date: Wed, 20 Sep 2023 09:42:49 +0400 Subject: [PATCH] done --- tasks/khalitova-am/lab_1/README.md | 42 +++++++++--------- .../khalitova-am/lab_1/{ => shots}/shot10.png | Bin .../khalitova-am/lab_1/{ => shots}/shot11.png | Bin .../khalitova-am/lab_1/{ => shots}/shot12.png | Bin .../khalitova-am/lab_1/{ => shots}/shot13.png | Bin .../khalitova-am/lab_1/{ => shots}/shot14.png | Bin .../khalitova-am/lab_1/{ => shots}/shot15.png | Bin .../khalitova-am/lab_1/{ => shots}/shot16.png | Bin .../khalitova-am/lab_1/{ => shots}/shot17.png | Bin .../khalitova-am/lab_1/{ => shots}/shot18.png | Bin .../khalitova-am/lab_1/{ => shots}/shot19.png | Bin .../khalitova-am/lab_1/{ => shots}/shot2.png | Bin .../khalitova-am/lab_1/{ => shots}/shot20.png | Bin .../khalitova-am/lab_1/{ => shots}/shot21.png | Bin .../khalitova-am/lab_1/{ => shots}/shot22.png | Bin .../khalitova-am/lab_1/{ => shots}/shot3.png | Bin .../khalitova-am/lab_1/{ => shots}/shot4.png | Bin .../khalitova-am/lab_1/{ => shots}/shot5.png | Bin .../khalitova-am/lab_1/{ => shots}/shot6.png | Bin .../khalitova-am/lab_1/{ => shots}/shot7.png | Bin .../khalitova-am/lab_1/{ => shots}/shot8.png | Bin .../khalitova-am/lab_1/{ => shots}/shot9.png | Bin 22 files changed, 21 insertions(+), 21 deletions(-) rename tasks/khalitova-am/lab_1/{ => shots}/shot10.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot11.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot12.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot13.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot14.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot15.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot16.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot17.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot18.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot19.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot2.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot20.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot21.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot22.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot3.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot4.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot5.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot6.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot7.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot8.png (100%) rename tasks/khalitova-am/lab_1/{ => shots}/shot9.png (100%) diff --git a/tasks/khalitova-am/lab_1/README.md b/tasks/khalitova-am/lab_1/README.md index 2290e40..b22619b 100644 --- a/tasks/khalitova-am/lab_1/README.md +++ b/tasks/khalitova-am/lab_1/README.md @@ -40,21 +40,21 @@ services: #описание контейнеров ![](shots/shot1.png) Открываем Docker Desktop и проверяем, что контейнер сервера базы данных и MediaWiki созданы и запущены: -![](shot2.png) +![](shots/shot2.png) Переходим на http://localhost:8081: -![](shot3.png) +![](shots/shot3.png) Переходим к установке MediaWiki и прописываем указанные нами в файле `mysql.env` значения хоста, имя пользователя и пароль: -![](shot4.png) -![](shot5.png) -![](shot6.png) +![](shots/shot4.png) +![](shots/shot5.png) +![](shots/shot6.png) Далее заполняем данные страницы вики: -![](shot7.png) +![](shots/shot7.png) И завершаем установку путем скачивания и открытия файла настроек страницы: -![](shot8.png) +![](shots/shot8.png) ## Разворачивание сервиса Wordpress @@ -95,20 +95,20 @@ volumes: ``` Через командную строку разворачиваем сервис: -![](shot9.png) +![](shots/shot9.png) В Docker Desktop проверяем, что оба контейнера запущены: -![](shot10.png) +![](shots/shot10.png) Теперь переходим на http://localhost:8080: -![](shot11.png) +![](shots/shot11.png) И устанавливаем Wordpress: -![](shot12.png) +![](shots/shot12.png) Далее осуществляем вход и попадаем на главную страницу, что говорит об успешной установке: -![](shot13.png) -![](shot14.png) +![](shots/shot13.png) +![](shots/shot14.png) ## Разворачивание сервиса Redmine @@ -137,26 +137,26 @@ services: MYSQL_DATABASE: redmine ``` Далее в командной строке разворачиваем сервис командой `docker-compose up`: -![](shot15.png) +![](shots/shot15.png) В Docker Desktop проверяем, что работают все три развернутых сервиса: -![](shot16.png) +![](shots/shot16.png) Переходим на http://localhost:8082: -![](shot17.png) +![](shots/shot17.png) Здесь мы можем выполнить вход как администратор или зарегистрироваться как пользователь. Попробуем зарегистрироваться: -![](shot18.png) +![](shots/shot18.png) Теперь попробуем войти в качестве пользователя: -![](shot19.png) +![](shots/shot19.png) И получаем ответ, что мы не можем этого сделать без подтверждения учетной записи админом. Заходим в качестве администратора под логином и паролем admin/admin: -![](shot20.png) +![](shots/shot20.png) И попадаем в профиль администратора: -![](shot21.png) +![](shots/shot21.png) И так как мы являемся администратором, то в разделе администрирование/пользователи, мы можем подтвердить созданного нами ранее пользователя: -![](shot22.png) \ No newline at end of file +![](shots/shot22.png) \ No newline at end of file diff --git a/tasks/khalitova-am/lab_1/shot10.png b/tasks/khalitova-am/lab_1/shots/shot10.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot10.png rename to tasks/khalitova-am/lab_1/shots/shot10.png diff --git a/tasks/khalitova-am/lab_1/shot11.png b/tasks/khalitova-am/lab_1/shots/shot11.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot11.png rename to tasks/khalitova-am/lab_1/shots/shot11.png diff --git a/tasks/khalitova-am/lab_1/shot12.png b/tasks/khalitova-am/lab_1/shots/shot12.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot12.png rename to tasks/khalitova-am/lab_1/shots/shot12.png diff --git a/tasks/khalitova-am/lab_1/shot13.png b/tasks/khalitova-am/lab_1/shots/shot13.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot13.png rename to tasks/khalitova-am/lab_1/shots/shot13.png diff --git a/tasks/khalitova-am/lab_1/shot14.png b/tasks/khalitova-am/lab_1/shots/shot14.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot14.png rename to tasks/khalitova-am/lab_1/shots/shot14.png diff --git a/tasks/khalitova-am/lab_1/shot15.png b/tasks/khalitova-am/lab_1/shots/shot15.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot15.png rename to tasks/khalitova-am/lab_1/shots/shot15.png diff --git a/tasks/khalitova-am/lab_1/shot16.png b/tasks/khalitova-am/lab_1/shots/shot16.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot16.png rename to tasks/khalitova-am/lab_1/shots/shot16.png diff --git a/tasks/khalitova-am/lab_1/shot17.png b/tasks/khalitova-am/lab_1/shots/shot17.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot17.png rename to tasks/khalitova-am/lab_1/shots/shot17.png diff --git a/tasks/khalitova-am/lab_1/shot18.png b/tasks/khalitova-am/lab_1/shots/shot18.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot18.png rename to tasks/khalitova-am/lab_1/shots/shot18.png diff --git a/tasks/khalitova-am/lab_1/shot19.png b/tasks/khalitova-am/lab_1/shots/shot19.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot19.png rename to tasks/khalitova-am/lab_1/shots/shot19.png diff --git a/tasks/khalitova-am/lab_1/shot2.png b/tasks/khalitova-am/lab_1/shots/shot2.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot2.png rename to tasks/khalitova-am/lab_1/shots/shot2.png diff --git a/tasks/khalitova-am/lab_1/shot20.png b/tasks/khalitova-am/lab_1/shots/shot20.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot20.png rename to tasks/khalitova-am/lab_1/shots/shot20.png diff --git a/tasks/khalitova-am/lab_1/shot21.png b/tasks/khalitova-am/lab_1/shots/shot21.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot21.png rename to tasks/khalitova-am/lab_1/shots/shot21.png diff --git a/tasks/khalitova-am/lab_1/shot22.png b/tasks/khalitova-am/lab_1/shots/shot22.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot22.png rename to tasks/khalitova-am/lab_1/shots/shot22.png diff --git a/tasks/khalitova-am/lab_1/shot3.png b/tasks/khalitova-am/lab_1/shots/shot3.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot3.png rename to tasks/khalitova-am/lab_1/shots/shot3.png diff --git a/tasks/khalitova-am/lab_1/shot4.png b/tasks/khalitova-am/lab_1/shots/shot4.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot4.png rename to tasks/khalitova-am/lab_1/shots/shot4.png diff --git a/tasks/khalitova-am/lab_1/shot5.png b/tasks/khalitova-am/lab_1/shots/shot5.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot5.png rename to tasks/khalitova-am/lab_1/shots/shot5.png diff --git a/tasks/khalitova-am/lab_1/shot6.png b/tasks/khalitova-am/lab_1/shots/shot6.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot6.png rename to tasks/khalitova-am/lab_1/shots/shot6.png diff --git a/tasks/khalitova-am/lab_1/shot7.png b/tasks/khalitova-am/lab_1/shots/shot7.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot7.png rename to tasks/khalitova-am/lab_1/shots/shot7.png diff --git a/tasks/khalitova-am/lab_1/shot8.png b/tasks/khalitova-am/lab_1/shots/shot8.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot8.png rename to tasks/khalitova-am/lab_1/shots/shot8.png diff --git a/tasks/khalitova-am/lab_1/shot9.png b/tasks/khalitova-am/lab_1/shots/shot9.png similarity index 100% rename from tasks/khalitova-am/lab_1/shot9.png rename to tasks/khalitova-am/lab_1/shots/shot9.png