From b23106dc3d910ccc25250764805fea505794d103 Mon Sep 17 00:00:00 2001
From: Aibdasfun <ilyasadkin@yandex.ru>
Date: Wed, 14 Feb 2024 21:13:53 +0600
Subject: [PATCH 1/3] first

---
 Docker/code/index.php                     |  4 ++
 Docker/fpm/Dockerfile                     | 27 ++++++++++
 Docker/fpm/php.ini                        |  2 +
 Docker/fpm/zz-docker.conf                 |  6 +++
 Docker/nginx/Dockerfile                   |  7 +++
 Docker/nginx/hosts/application.local.conf | 26 +++++++++
 code/index.php                            |  4 ++
 docker-compose.yml                        | 65 +++++++++++++++++++++++
 docker-compose.yml.bak                    | 54 +++++++++++++++++++
 9 files changed, 195 insertions(+)
 create mode 100644 Docker/code/index.php
 create mode 100644 Docker/fpm/Dockerfile
 create mode 100644 Docker/fpm/php.ini
 create mode 100644 Docker/fpm/zz-docker.conf
 create mode 100644 Docker/nginx/Dockerfile
 create mode 100644 Docker/nginx/hosts/application.local.conf
 create mode 100644 code/index.php
 create mode 100644 docker-compose.yml
 create mode 100644 docker-compose.yml.bak

diff --git a/Docker/code/index.php b/Docker/code/index.php
new file mode 100644
index 000000000..234b921c1
--- /dev/null
+++ b/Docker/code/index.php
@@ -0,0 +1,4 @@
+<?php
+echo "Hello, Проверяющие :)";
+
+phpinfo();
\ No newline at end of file
diff --git a/Docker/fpm/Dockerfile b/Docker/fpm/Dockerfile
new file mode 100644
index 000000000..cfd30ef9a
--- /dev/null
+++ b/Docker/fpm/Dockerfile
@@ -0,0 +1,27 @@
+FROM php:8.3-fpm
+
+RUN apt-get update && apt-get install -y \
+        curl \
+        wget \
+        git \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+	libpng-dev \
+	libonig-dev \
+	libzip-dev \
+        && docker-php-ext-install -j$(nproc) iconv mbstring mysqli pdo_mysql zip \
+	&& docker-php-ext-configure gd --with-freetype --with-jpeg \
+        && docker-php-ext-install -j$(nproc) gd \
+    && mkdir -p /run/php
+
+# Устанавливаем Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY php.ini /usr/local/etc/php/conf.d/php-custom.ini
+COPY zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf
+
+
+WORKDIR /data
+
+VOLUME /data
+
+CMD ["php-fpm"]
diff --git a/Docker/fpm/php.ini b/Docker/fpm/php.ini
new file mode 100644
index 000000000..58ae75084
--- /dev/null
+++ b/Docker/fpm/php.ini
@@ -0,0 +1,2 @@
+session.save_handler = memcache
+session.save_path = "tcp://memcache:11211"
\ No newline at end of file
diff --git a/Docker/fpm/zz-docker.conf b/Docker/fpm/zz-docker.conf
new file mode 100644
index 000000000..24e4b9ebd
--- /dev/null
+++ b/Docker/fpm/zz-docker.conf
@@ -0,0 +1,6 @@
+[global]
+daemonize = no
+
+[www]
+listen = /run/php/php-fpm.sock
+listen.mode = 0666
\ No newline at end of file
diff --git a/Docker/nginx/Dockerfile b/Docker/nginx/Dockerfile
new file mode 100644
index 000000000..a0d6cfcfd
--- /dev/null
+++ b/Docker/nginx/Dockerfile
@@ -0,0 +1,7 @@
+FROM nginx:latest
+COPY hosts/application.local.conf /etc/nginx/conf.d/application.local.conf
+
+WORKDIR /data  
+VOLUME /data  
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/Docker/nginx/hosts/application.local.conf b/Docker/nginx/hosts/application.local.conf
new file mode 100644
index 000000000..9f216dda7
--- /dev/null
+++ b/Docker/nginx/hosts/application.local.conf
@@ -0,0 +1,26 @@
+server {
+    listen 80;
+    server_name application.local;
+
+    root /data/application.local;
+
+    index index.php index.html;
+
+    location ~* .(jpg|jpeg|gif|css|png|js|ico|html)$ {
+        access_log off;
+        expires max;
+    }
+
+ location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~* .php$ {
+        try_files $uri = 404;
+        fastcgi_split_path_info ^(.+.php)(/.+)$;
+        fastcgi_pass unix:/var/run/php/php-fpm.sock;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
+}
diff --git a/code/index.php b/code/index.php
new file mode 100644
index 000000000..260034c7f
--- /dev/null
+++ b/code/index.php
@@ -0,0 +1,4 @@
+<?php
+echo "Hello, Otus!";
+
+phpinfo();
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..f07d1a77a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,65 @@
+
+version: '3'
+
+services:
+  app:
+    build:
+      context: Docker/fpm
+      dockerfile: Dockerfile
+    image: myapp/php
+    container_name: app
+    volumes:
+       - ./Docker/code:/data/application.local
+       - "phpsocket:/var/run"
+    networks:
+      - app-network
+
+  webserver:
+    build:
+      context: Docker/nginx
+      dockerfile: Dockerfile
+    image: myapp/nginx
+    container_name: webserver
+    ports:
+      - "8080:80"
+      - "443:443"
+    volumes:
+       - ./Docker/code:/data/application.local
+       - "phpsocket:/var/run"
+    networks:
+      - app-network
+
+  memcached:
+    image: memcached:latest
+    ports:
+      - "11211:11211"
+    networks:
+      - app-network
+
+  redis:
+    image: redis:latest
+    ports:
+      - "6379:6379"
+    networks:
+      - app-network
+
+  postgres_db:
+    image: postgres:latest
+    container_name: db
+    restart: always
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    ports:
+      - '5432:5432'
+    volumes:
+      - postgres_db:/var/lib/postgresql/data
+
+
+volumes:
+  postgres_db:
+    driver: local
+  phpsocket:
+networks:
+  app-network:
+    driver: bridge
\ No newline at end of file
diff --git a/docker-compose.yml.bak b/docker-compose.yml.bak
new file mode 100644
index 000000000..b85eca15f
--- /dev/null
+++ b/docker-compose.yml.bak
@@ -0,0 +1,54 @@
+# версия синтаксиса
+version: '3'
+
+# в этом блоке мы описываем контейнеры, которые будут запускаться
+services:
+
+  #Контейнер с PHP, назовём его app
+  app:
+    # Если нет секции build, то система будет искать образ в репозиториях
+    build:
+      context: ./fpm
+      dockerfile: Dockerfile
+    image: myapp/php # имя будущего образа
+    container_name: app # имя контейнера после запуска
+    volumes:
+       - ./code:/data/mysite.local
+    # мы можем создать для контейнеров внутреннюю сеть
+    networks:
+      - app-network
+
+  #контейне с Nginx
+  webserver:
+    build:
+      context: ./nginx
+      dockerfile: Dockerfile
+    image: myapp/nginx
+    container_name: webserver
+    volumes:
+       - ./code:/data/mysite.local
+    # проброс портов
+    ports:
+      - "80:80"
+      - "443:443"
+    networks:
+      - app-network
+
+  #MySQL Service
+  db:
+    image: mysql:5.7.22
+    container_name: db
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+    networks:
+      - app-network
+    volumes:
+      - ./dbdata:/var/lib/mysql  
+
+#Docker Networks
+networks:
+  app-network:
+    driver: bridge
\ No newline at end of file

From d4020b3c5ebf38a4c5989efec544134a603c5163 Mon Sep 17 00:00:00 2001
From: Aibdasfun <ilyasadkin@yandex.ru>
Date: Thu, 15 Feb 2024 22:35:57 +0600
Subject: [PATCH 2/3] first

---
 calc.sh  | 19 +++++++++++++++++++
 city.sh  | 12 ++++++++++++
 city.txt | 15 +++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100755 calc.sh
 create mode 100755 city.sh
 create mode 100644 city.txt

diff --git a/calc.sh b/calc.sh
new file mode 100755
index 000000000..875859d9a
--- /dev/null
+++ b/calc.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ $# -ne 2 ]; then
+	echo "Дай мне два числа, которые разделены пробелом :)"
+	exit
+fi
+
+num1=$(echo "$1" | sed 's/,/./')
+
+num2=$(echo "$2" | sed 's/,/./')
+
+if ! [[ $num1 =~ ^-?[0-9]+(\.[0-9]+)?$ ]] || ! [[ $num2 =~ ^-?[0-9]+(\.[0-9]+)?$ ]]; then
+	echo "Мне не удалось распознать передаваемые числа :("
+	exit
+fi
+
+sum=$(awk "BEGIN {print $num1 + $num2}")
+
+echo "Ответ: $sum"
\ No newline at end of file
diff --git a/city.sh b/city.sh
new file mode 100755
index 000000000..542335ff8
--- /dev/null
+++ b/city.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ -z $2 ]; then
+    count=3
+else
+    count=$2
+fi
+
+cat $1 | tail -n +2 | awk '{print $3}' | grep -v '^$'| sort | uniq | while read city; do
+	summ=$(cat $1 | tail -n +2 | grep $city | awk '{sum += $4;} END {print sum;}')
+	echo $city $summ
+done | sort -r -n -k2 | head -$count
\ No newline at end of file
diff --git a/city.txt b/city.txt
new file mode 100644
index 000000000..2cb3977b4
--- /dev/null
+++ b/city.txt
@@ -0,0 +1,15 @@
+id user city phone
+
+1 test Omsk 53984123
+
+2 test2 Moscow 1234123
+
+3 test3 Saint-P 1232121
+
+4 test4 Tver 4352124
+
+5 test5 Milan 7990923
+
+6 test6 Moscow 908213
+
+7 test7 Omsk 12682543
\ No newline at end of file

From 813b979d2227f5c11c62794f251a0a1da6eb7e14 Mon Sep 17 00:00:00 2001
From: Aibdasfun <ilyasadkin@yandex.ru>
Date: Fri, 16 Feb 2024 12:37:22 +0600
Subject: [PATCH 3/3] =?UTF-8?q?updated=20=D1=81alc=20and=20=D1=81ity=20val?=
 =?UTF-8?q?idators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calc.sh | 6 +++---
 city.sh | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/calc.sh b/calc.sh
index 875859d9a..5c86e3913 100755
--- a/calc.sh
+++ b/calc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -ne 2 ]; then
-	echo "Дай мне два числа, которые разделены пробелом :)"
+	echo "Дай мне два числа, разделенные пробелом :)"
 	exit
 fi
 
@@ -9,8 +9,8 @@ num1=$(echo "$1" | sed 's/,/./')
 
 num2=$(echo "$2" | sed 's/,/./')
 
-if ! [[ $num1 =~ ^-?[0-9]+(\.[0-9]+)?$ ]] || ! [[ $num2 =~ ^-?[0-9]+(\.[0-9]+)?$ ]]; then
-	echo "Мне не удалось распознать передаваемые числа :("
+if ! [[ $num1 =~ ^[-+]?[0-9]+(\.[0-9]+)?$ ]] || ! [[ $num2 =~ ^[-+]?[0-9]+(\.[0-9]+)?$ ]]; then
+	echo "Мне не удалось разобрать один из передаваемых аргументов :("
 	exit
 fi
 
diff --git a/city.sh b/city.sh
index 542335ff8..6038e2201 100755
--- a/city.sh
+++ b/city.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 
+if [ ! -f "$1" ]; then
+    	echo "Мне не удалось найти передаваемый файл."
+    	exit
+fi
+
 if [ -z $2 ]; then
-    count=3
+	count=3
 else
-    count=$2
+	count=$2
 fi
 
 cat $1 | tail -n +2 | awk '{print $3}' | grep -v '^$'| sort | uniq | while read city; do