#2 Тест слияние, по рофлу хз :)

Open
gr703_mimal wants to merge 4 commits from gr703_mimal/dev into gr703_mimal/master
5 changed files with 36 additions and 6 deletions
  1. 17 0
      Dockerfile
  2. 3 2
      main/urls.py
  3. 16 4
      main/views.py
  4. BIN
      requirements.txt
  5. BIN
      отчёт.docx

+ 17 - 0
Dockerfile

@@ -0,0 +1,17 @@
+FROM python:3.9
+
+ENV PYTHONUNBUFFERED=1
+
+LABEL "title"="lab-ttit"
+LABEL "creator"="gr703_mimal"
+
+WORKDIR /web-server
+
+COPY requirements.txt /web-server/
+
+RUN pip install -r requirements.txt
+
+CMD ["python", "manage.py", "migrate"]
+CMD ["python", "manage.py", "runserver"]
+
+COPY . /web-server/

+ 3 - 2
main/urls.py

@@ -3,6 +3,7 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.base_good),
-    path('shit', views.base_bad),
+    path('', views.base),
+    path('info', views.base_info),
+    path('ip', views.status_output),
 ]

+ 16 - 4
main/views.py

@@ -1,10 +1,22 @@
-from django.shortcuts import render
+import requests
+
+from bs4 import BeautifulSoup
 from django.http import HttpResponse
 
 
-def base_good(request):
+def base(request):
     return HttpResponse("<h1> Base views: Response - 200_OK </h1>")
 
 
-def base_bad(request):
-    return HttpResponse("<h1> Base views: Response - 404_Not_Found<br>Ah shit, here we go again...</h1>")
+def base_info(request):
+    return HttpResponse("<h1> Info views: Response - 200_OK<br>Mironov Misha</h1>")
+
+
+def status_output(request):
+    response = requests.get(url='https://2ip.ru/')
+    bs = BeautifulSoup(response.text, "lxml")
+    ip = bs.find('div', 'ip')
+
+    return HttpResponse(
+        f"<h1> IP: {ip.text} </h1><br><h3>Для безопасности изменены последние 2 числа (после точек)</h3>"
+    )

BIN
requirements.txt


BIN
отчёт.docx