kalyshev_yan_lab_1 is ready

dozorova_alena_lab_3/.gitignore

@@ -1,7 +0,0 @@
-
-/dozorova_alena_lab_3/PostService/.vs
-/dozorova_alena_lab_3/PostService/bin
-/dozorova_alena_lab_3/PostService/obj
-/dozorova_alena_lab_3/WorkerService/.vs
-/dozorova_alena_lab_3/WorkerService/bin
-/dozorova_alena_lab_3/WorkerService/obj

dozorova_alena_lab_3/PostService/.dockerignore

@@ -1,30 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-!**/.gitignore
-!.git/HEAD
-!.git/config
-!.git/packed-refs
-!.git/refs/heads/**

dozorova_alena_lab_3/PostService/Controllers/HomeController.cs

@@ -1,94 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace PostService.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class HomeController : ControllerBase
-    {
-        private readonly ILogger<HomeController> _logger;
-
-        public static List<Post> list = new List<Post>()
-        {
-            new Post()
-            {
-                Id = Guid.NewGuid(),
-                Name = "Default"
-            }
-        };
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-        }
-
-        [HttpGet("get")]
-        public IActionResult Get()
-        {
-            return list == null || list.Count == 0 ? NotFound() : Ok(list);
-        }
-
-        [HttpGet("get/{Id}")]
-        public IActionResult Get([FromRoute] Guid Id)
-        {
-            var obj = list.Where(l => l.Id == Id).FirstOrDefault();
-            return obj == null ? NotFound() : Ok(obj);
-        }
-
-        [HttpPost("create")]
-        public IActionResult Create([FromBody] CreateUpdatePost data)
-        {
-            try
-            {
-                var model = new Post()
-                {
-                    Id = Guid.NewGuid(),
-                    Name = data.Name,
-                };
-
-                list.Add(model);
-
-                var modelForResult = new CreateUpdatePost
-                {
-                    Name = model.Name
-                };
-
-                return Ok(modelForResult);
-            }
-            catch (Exception ex)
-            {
-                return BadRequest(ex.Message);
-            }
-        }
-
-        [HttpPut("update/{Id}")]
-        public IActionResult Update([FromRoute] Guid Id,
-                                    [FromBody] CreateUpdatePost data)
-        {
-            var oldModel = list.Where(l => l.Id == Id).Select(l => list.IndexOf(l)).FirstOrDefault();
-            if (oldModel != null)
-            {
-                list[oldModel].Name = data.Name;
-
-                var modelForResult = new CreateUpdatePost {
-                    Name = data.Name,
-                };
-
-                return Ok(modelForResult);
-            }
-            else return NotFound();
-        }
-
-        [HttpDelete("delete/{Id}")]
-        public IActionResult Delete([FromRoute] Guid Id)
-        {
-            var model = list.Where(l => l.Id != Id).FirstOrDefault();
-
-            if (model != null) {
-                list.Remove(model);
-                return Ok();
-            }
-            else return NotFound();
-        }
-    }
-}

dozorova_alena_lab_3/PostService/Dockerfile

@@ -1,24 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-EXPOSE 443
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /src
-COPY ["PostService.csproj", "."]
-RUN dotnet restore "./PostService.csproj"
-COPY . .
-WORKDIR "/src/."
-RUN dotnet build "./PostService.csproj" -c $BUILD_CONFIGURATION -o /app/build
-
-FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./PostService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "PostService.dll"]

dozorova_alena_lab_3/PostService/Entities.cs

@@ -1,16 +0,0 @@
-namespace PostService
-{
-    public class Post
-    {
-        public Guid Id { get; set; }
-        public string Name { get; set; }
-    }
-
-    public class PostDTO : Post { }
-
-    public class CreateUpdatePost
-    {
-        public string Name { get; set; }
-    }
-
-}

dozorova_alena_lab_3/PostService/PostService.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>1a8ae13d-1a3e-4308-955e-4fbf68b758c9</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>.</DockerfileContext>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>

dozorova_alena_lab_3/PostService/PostService.csproj.user

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>PostService</ActiveDebugProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>

dozorova_alena_lab_3/PostService/PostService.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.10.35004.147
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService", "PostService.csproj", "{EB304D56-A05F-41BC-9523-B5FEB658BCEE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EB304D56-A05F-41BC-9523-B5FEB658BCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB304D56-A05F-41BC-9523-B5FEB658BCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB304D56-A05F-41BC-9523-B5FEB658BCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB304D56-A05F-41BC-9523-B5FEB658BCEE}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6625EB51-D403-4C57-A7C2-AA01C90AB472}
-	EndGlobalSection
-EndGlobal

dozorova_alena_lab_3/PostService/Program.cs

@@ -1,31 +0,0 @@
-using Microsoft.OpenApi.Models;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-app.UseSwagger(c =>
-{
-
-    c.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
-    {
-        swaggerDoc.Servers = new List<OpenApiServer> { new OpenApiServer { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}/postservice" } };
-    });
-});
-app.UseSwaggerUI();
-
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

dozorova_alena_lab_3/PostService/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "profiles": {
-    "PostService": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:7293;http://localhost:5139"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Container (Dockerfile)": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "https://+:443;http://+:80"
-      },
-      "publishAllPorts": true,
-      "useSSL": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:36974",
-      "sslPort": 44370
-    }
-  }
-}

dozorova_alena_lab_3/PostService/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

dozorova_alena_lab_3/PostService/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

dozorova_alena_lab_3/WorkerService/.dockerignore

@@ -1,30 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-!**/.gitignore
-!.git/HEAD
-!.git/config
-!.git/packed-refs
-!.git/refs/heads/**

dozorova_alena_lab_3/WorkerService/Controllers/HomeController.cs

@@ -1,112 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Hosting;
-using RestSharp;
-
-namespace WorkerService.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class HomeController : ControllerBase
-    {
-        private readonly ILogger<HomeController> _logger;
-        private readonly RestClient _restClient;
-
-        public static List<WorkerEntity> list = new List<WorkerEntity>();
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-            _restClient = new RestClient("http://nginx/postservice/Home");
-        }
-
-        [HttpGet("get")]
-        public IActionResult Get()
-        {
-            if (list == null || list.Count == 0)
-            {
-                return NotFound();
-            }
-
-            var result = list.Select(l => new GetEntity
-            {
-                Id = l.Id,
-                FIO = l.FIO,
-                PostId = l.PostId,
-            });
-
-            return Ok(result);
-        }
-
-        [HttpGet("get/{Id}")]
-        public IActionResult Get([FromRoute] Guid Id)
-        {
-            var obj = list.Where(l => l.Id == Id);
-            return obj == null ? NotFound() : Ok(obj);
-        }
-
-        [HttpPost("create")]
-        public async Task<IActionResult> CreateAsync([FromBody] CreateUpdateWorker data)
-        {
-            try
-            {
-                var model = new WorkerEntity()
-                {
-                    Id = Guid.NewGuid(),
-                    FIO = data.FIO,
-                    PostId = data.PostId,
-                };
-
-                var restRequest = new RestRequest($"/get/{data.PostId}", Method.Get);
-                var responce = await _restClient.ExecuteAsync<PostEntity>(restRequest);
-
-                if (!responce.IsSuccessful)
-                {
-                    return BadRequest(responce);
-                }
-
-                model.Post = responce.Data;
-
-                list.Add(model);
-
-                return Ok(model);
-            }
-            catch (Exception ex)
-            {
-                return BadRequest(ex.Message);
-            }
-        }
-
-        [HttpPut("update/{Id}")]
-        public IActionResult Update([FromRoute] Guid Id,
-                                    [FromBody] CreateUpdateWorker data)
-        {
-            var oldModel = list.Where(l => l.Id == Id).Select(l => list.IndexOf(l)).FirstOrDefault();
-            if (oldModel != null)
-            {
-                list[oldModel].FIO = data.FIO;
-                list[oldModel].PostId = data.PostId;
-
-                var modelForResult = new CreateUpdateWorker
-                {
-                    FIO = data.FIO,
-                    PostId = data.PostId,
-                };
-
-                return Ok(modelForResult);
-            }
-            else return NotFound();
-        }
-
-        [HttpDelete("delete/{Id}")]
-        public IActionResult Delete([FromRoute] Guid Id)
-        {
-            var model = list.Where(l => l.Id != Id).FirstOrDefault();
-
-            if (model != null)
-            {
-                list.Remove(model);
-                return Ok();
-            }
-            else return NotFound();
-        }
-    }
-}

dozorova_alena_lab_3/WorkerService/Dockerfile

@@ -1,24 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-EXPOSE 443
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /src
-COPY ["WorkerService.csproj", "."]
-RUN dotnet restore "./WorkerService.csproj"
-COPY . .
-WORKDIR "/src/."
-RUN dotnet build "./WorkerService.csproj" -c $BUILD_CONFIGURATION -o /app/build
-
-FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./WorkerService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "WorkerService.dll"]

dozorova_alena_lab_3/WorkerService/Entities.cs

@@ -1,32 +0,0 @@
-namespace WorkerService
-{
-    public class WorkerEntity
-    {
-        public Guid Id { get; set; }
-        public string FIO { get; set; }
-
-        public Guid PostId { get; set; }
-        public PostEntity Post {  get; set; } 
-    }
-
-    public class PostEntity
-    {
-        public Guid id { get; set; }
-        public string name { get; set; }
-    }
-
-    public class CreateUpdateWorker
-    {
-        public string FIO { get; set; }
-
-        public Guid PostId { get; set; }
-    }
-
-    public class GetEntity
-    {
-        public Guid Id { get; set; }
-        public string FIO { get; set; }
-
-        public Guid PostId { get; set; }
-    }
-}

dozorova_alena_lab_3/WorkerService/Program.cs

@@ -1,32 +0,0 @@
-using Microsoft.OpenApi.Models;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-app.UseSwagger(c =>
-{        
-
-    c.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
-    {
-        swaggerDoc.Servers = new List<OpenApiServer> { new OpenApiServer { Url = $"{httpReq.Scheme}://{httpReq.Host.Value}/workerservice" } };
-    });
-});
-
-app.UseSwaggerUI();
-
-
-app.UseHttpsRedirection();
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

dozorova_alena_lab_3/WorkerService/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "profiles": {
-    "WorkerService": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:7144;http://localhost:5220"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Container (Dockerfile)": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "https://+:443;http://+:80"
-      },
-      "publishAllPorts": true,
-      "useSSL": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:55850",
-      "sslPort": 44303
-    }
-  }
-}

dozorova_alena_lab_3/WorkerService/WorkerService.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>3228803c-add9-46fb-b949-9e2a2e89056a</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerfileContext>.</DockerfileContext>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
-    <PackageReference Include="RestSharp" Version="112.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
-
-</Project>

dozorova_alena_lab_3/WorkerService/WorkerService.csproj.user

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>WorkerService</ActiveDebugProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>

dozorova_alena_lab_3/WorkerService/WorkerService.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.10.35004.147
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerService", "WorkerService.csproj", "{A9DF2332-E571-49AD-805A-D61B23C40D5F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A9DF2332-E571-49AD-805A-D61B23C40D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9DF2332-E571-49AD-805A-D61B23C40D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9DF2332-E571-49AD-805A-D61B23C40D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9DF2332-E571-49AD-805A-D61B23C40D5F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B515427C-329A-4B73-B82C-45D929A6EA75}
-	EndGlobalSection
-EndGlobal

dozorova_alena_lab_3/WorkerService/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

dozorova_alena_lab_3/WorkerService/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

dozorova_alena_lab_3/docker-compose.yml

@@ -1,21 +0,0 @@
-services:
-    nginx:
-        image: nginx
-        depends_on:
-            - postservice
-            - workerservice
-        volumes:
-            - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
-        ports:
-            - 80:80
-    
-    postservice:
-        build: .\PostService
-        ports:
-            - 81:8080
-    workerservice:
-        build: .\WorkerService
-        ports:
-            - 82:8080
-        depends_on:
-            - postservice

dozorova_alena_lab_3/nginx/nginx.conf

@@ -1,21 +0,0 @@
-server {
-    listen      80;
-    listen      [::]:80;
-    server_name localhost;
-
-    location /postservice/ {
-        proxy_pass       http://postservice:80/;
-		proxy_set_header Host      $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Prefix /admin;
-    }
-
-    location /workerservice/ {
-        proxy_pass       http://workerservice:80/;
-		proxy_set_header Host      $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Prefix /admin;
-    }
-}

dozorova_alena_lab_3/readme.md

@@ -1,16 +0,0 @@
-# Лабораторная работа 3
-В работе представлен пример синхронного обмена сообщениями между сервисами и их взаимодейсвием с внешним миром.
-## Описание
-Были взяты две сущности: работник и должность. Первый сервис позволяет манипулировать списком должностей, второй - списком работников, у каждого из которых может быть одна должность. У одной должности может быть много работников.
-Реализована система была с помощью web-api на c# с хранением данных в оперативной памяти.
-В качестве интерфейса используется Swagger, который можно использовать для отправки запросов. 
-## Запуск
-Для запуска лабораторной работы необходимо иметь запущенный Docker.
-Необходимо перейти в папку, где располагается данный файл. Далее открыть терминал и ввести команду:
-```
-docker compose up -d --build
-```
-Важно, чтобы в этот момент на компьютере был свободен порт 80.
-В результате, после сборки вся система запустится и Swagger-ы будут доступны по путям http://localhost/postservice/swagger и http://localhost/workerservice/swagger
-## Видеодемонстрация
-Видеодемонстрация результата лабораторной работы представлена по [адресу](https://drive.google.com/file/d/1rg2xnXM-jPDfFJWxNIitq0I8kXj9Pr3-/view?usp=sharing)

kalyshev_yan_lab_1/.gitignore

@@ -0,0 +1,6 @@
+gitea/
+gitea-db/
+images/
+LocalSettings.php
+mediawiki-db/
+readmine-db/

kalyshev_yan_lab_1/README.md

@@ -0,0 +1,94 @@
+# Калышев Ян ПИбд-42
+
+## Описание
+
+Этот проект разворачивает среду с баг-трекером Redmine, сервис для хранения репозиториев git Gitea, вики Mediawiki и базы данных для каждого сервиса с использованием Docker Compose. Ниже приведены шаги для запуска и настройки.
+
+## 0. Предварительные действия
+
+Перед запуском Docker Compose выполнил следующие шаги:
+
+1. Установил docker, docker-buildx (пусть будет) и docker-compose для моей операционной системы.
+2. Запустил и поставил в автозапуск docker через `sudo systemctl enable --now docker`.
+
+## 1. Структура и запуск сервиса
+
+Файл `docker-compose.yml` содержит описание 6 сервисов:
+
+- gitea (Gitea);
+- gitea-db (MySQL для Gitea);
+- readmine (Readmine);
+- readmine-db (MySQL для Readmine);
+- mediawiki (Mediawiki);
+- mediawiki-db (MariaDB для Mediawiki);
+
+Запуск всех сервисов происходит через команду:
+
+```bash
+docker-compose up -d
+```
+
+## 1. Gitea
+
+- **Образ**: `gitea/gitea:latest`
+- **Порты**:
+  - `3000:3000` — http порт Gitea http://localhost:3000.
+  - `222:22` - порт для проброса ssh
+- **Переменные окружения**:
+  - `USER_UID=1000` - uid пользователя, от которого запускается gitea
+  - `USER_GID=1000` - gid пользователя, от которого запускается gitea
+  - `GITEA__database__DB_TYPE: mysql` - тип бд
+  - `GITEA__database__HOST: gitea-db:3306` - адрес бд
+  - `GITEA__database__NAME: gitea` - имя бд
+  - `GITEA__database__USER: gitea` - пользователь бд
+  - `GITEA__database__PASSWD: gitea` - пароль бд
+- **Тома**:
+  - `./gitea:/data` — хранение файлов gitea.
+  - `/etc/timezone:/etc/timezone:ro` - проброс часового пояса из хост-системы
+  - `/etc/localtime:/etc/localtime:ro` - проброс часового пояса из хост-системы
+- **links, depends_on**
+  - `gitea-db` - для запуска строго после бд и гарантированной связи сетей
+
+## 2. Readmine
+
+- **Образ**: `readmine:latest`
+- **Порты**:
+  - `8080:3000` — http порт Readmine http://localhost:8080.
+- **Переменные окружения**:
+  - `REDMINE_DB_MYSQL: readmine-db` - адрес бд
+  - `REDMINE_DB_PASSWORD: example` - пароль бд
+  - `REDMINE_SECRET_KEY_BASE: supersecretkey` - секретный ключ текущего инстанса
+- **links, depends_on**
+  - `readmine-db` - для запуска строго после бд и гарантированной связи сетей
+
+## 3. Mediawiki
+
+- **Образ**: `mediawiki:latest`
+- **Порты**:
+  - `8081:3000` — http порт Mediawiki http://localhost:8081.
+- **Тома**:
+  - `./images:/var/www/html/images` — хранение изображений mediawiki.
+  - `./LocalSettings.php:/var/www/html/LocalSettings.php` - проброс файла с настройками после прохождения первичной настройки
+- **links, depends_on**
+  - `mediawiki-db` - для запуска строго после бд и гарантированной связи сетей
+
+## 4. Базы данных
+
+- **Образы**: `mariadb`, `mysql:8.0` (в соответствии с офф. документациями)
+- **Тома**:
+  - `./gitea-db:/var/lib/mysql` — хранение данных бд gitea.
+  - `./readmine-db:/var/lib/mysql` — хранение данных бд readmine.
+  - `./mediawiki-db:/var/lib/mysql` — хранение данных бд mediawiki.
+- **Переменные окружения** - взяты в соответствии с офф. документациями
+
+## 6. Остановка сервисов
+
+Для остановки и удаления всех контейнеров необходимо выполнить команду:
+
+```bash
+docker-compose down
+```
+
+## 7. Ссылка на видео
+
+[Видео-отчёт Калышев Ян ПИбд-42](https://zyzf.space/s/stezZksnbyqaWYo)

kalyshev_yan_lab_1/docker-compose.yml

@@ -0,0 +1,81 @@
+services:
+  gitea:
+    image: gitea/gitea:latest
+    environment:
+      USER_UID: 1000
+      USER_GID: 1000
+      GITEA__database__DB_TYPE: mysql
+      GITEA__database__HOST: gitea-db:3306
+      GITEA__database__NAME: gitea
+      GITEA__database__USER: gitea
+      GITEA__database__PASSWD: gitea
+    restart: always
+    links:
+      - gitea-db
+    depends_on:
+      - gitea-db
+    volumes:
+      - ./gitea:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "3000:3000"
+      - "222:22"
+
+  gitea-db:
+    image: mysql:8.0
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: gitea
+      MYSQL_USER: gitea
+      MYSQL_PASSWORD: gitea
+      MYSQL_DATABASE: gitea
+    volumes:
+      - ./gitea-db:/var/lib/mysql
+
+  redmine:
+    image: redmine:latest
+    restart: always
+    ports:
+      - 8080:3000
+    links:
+      - readmine-db
+    depends_on:
+      - readmine-db
+    environment:
+      REDMINE_DB_MYSQL: readmine-db
+      REDMINE_DB_PASSWORD: example
+      REDMINE_SECRET_KEY_BASE: supersecretkey
+
+  readmine-db:
+    image: mysql:8.0
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: example
+      MYSQL_DATABASE: redmine
+    volumes:
+      - ./readmine-db:/var/lib/mysql
+
+  mediawiki:
+    image: mediawiki:latest
+    restart: always
+    ports:
+      - 8081:80
+    links:
+      - mediawiki-db
+    depends_on:
+      - mediawiki-db
+    volumes:
+      - ./images:/var/www/html/images
+      - ./LocalSettings.php:/var/www/html/LocalSettings.php
+
+  mediawiki-db:
+    image: mariadb
+    restart: always
+    environment:
+      MYSQL_DATABASE: my_wiki
+      MYSQL_USER: wikiuser
+      MYSQL_PASSWORD: example
+      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
+    volumes:
+      - ./mediawiki-db:/var/lib/mysql