From 1cdac31a5dc960b8694e082c5807467633ecb75b Mon Sep 17 00:00:00 2001 From: ruden Date: Mon, 30 Oct 2023 23:41:47 +0300 Subject: [PATCH 1/2] lab-2 --- tasks/mironov-eo/lab_2/.dockerignore | 2 + tasks/mironov-eo/lab_2/.gitignore | 481 ++++++++++++++++++ tasks/mironov-eo/lab_2/README.md | 71 +++ tasks/mironov-eo/lab_2/data/another_data.txt | 5 + tasks/mironov-eo/lab_2/data/data.txt | 11 + tasks/mironov-eo/lab_2/docker-compose.yml | 14 + tasks/mironov-eo/lab_2/worker-1/Dockerfile | 11 + tasks/mironov-eo/lab_2/worker-1/Program.cs | 8 + .../mironov-eo/lab_2/worker-1/worker-1.csproj | 11 + tasks/mironov-eo/lab_2/worker-2/Dockerfile | 11 + tasks/mironov-eo/lab_2/worker-2/Program.cs | 20 + .../mironov-eo/lab_2/worker-2/worker-2.csproj | 11 + 12 files changed, 656 insertions(+) create mode 100644 tasks/mironov-eo/lab_2/.dockerignore create mode 100644 tasks/mironov-eo/lab_2/.gitignore create mode 100644 tasks/mironov-eo/lab_2/README.md create mode 100644 tasks/mironov-eo/lab_2/data/another_data.txt create mode 100644 tasks/mironov-eo/lab_2/data/data.txt create mode 100644 tasks/mironov-eo/lab_2/docker-compose.yml create mode 100644 tasks/mironov-eo/lab_2/worker-1/Dockerfile create mode 100644 tasks/mironov-eo/lab_2/worker-1/Program.cs create mode 100644 tasks/mironov-eo/lab_2/worker-1/worker-1.csproj create mode 100644 tasks/mironov-eo/lab_2/worker-2/Dockerfile create mode 100644 tasks/mironov-eo/lab_2/worker-2/Program.cs create mode 100644 tasks/mironov-eo/lab_2/worker-2/worker-2.csproj diff --git a/tasks/mironov-eo/lab_2/.dockerignore b/tasks/mironov-eo/lab_2/.dockerignore new file mode 100644 index 0000000..54fec4f --- /dev/null +++ b/tasks/mironov-eo/lab_2/.dockerignore @@ -0,0 +1,2 @@ +*/*/bin +*/*/obj diff --git a/tasks/mironov-eo/lab_2/.gitignore b/tasks/mironov-eo/lab_2/.gitignore new file mode 100644 index 0000000..f20ffbc --- /dev/null +++ b/tasks/mironov-eo/lab_2/.gitignore @@ -0,0 +1,481 @@ +## Наши данные для работы программы +result-1/ +result/ + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk diff --git a/tasks/mironov-eo/lab_2/README.md b/tasks/mironov-eo/lab_2/README.md new file mode 100644 index 0000000..16213f3 --- /dev/null +++ b/tasks/mironov-eo/lab_2/README.md @@ -0,0 +1,71 @@ +# Отчёт по лабораторной работе №1 + +Выполнил: студент гр. ИСЭбд-41 Миронов Евгений. + +Вариант программы 1: Берёт из каталога `/var/data` случайный файл и перекладывает его в `/var/result/data.txt`. + +Вариант программы 2: Сохраняет произведение первого и последнего числа из файла `/var/data/data.txt` в `/var/result/result.txt`. + +## Создание приложений + +Создадим 2 приложения. +Создано два приложения .Net 7.0 на языке C# с помощью команд: + +Для создания обычных консольных приложений воспользуемся командами: + +```sh +dotnet new console -o worker-1 +dotnet new console -o worker-2 +``` + +Согласно варианту программа 1 должна выбирать рандомный файл из папки `/var/data` и перемещать его в папку `/var/result/data.txt`. + +[Исходный текст программы worker-1](worker-1/Program.cs) + +Согласно варианту программа 2 должна первую и последнюю строки файла `/var/data/data.txt`, пытаться привести их к числам, а затем заниматься их произведением. +Затем результат вычислений копируется в файл `/var/result/result.txt`. + +[Исходный текст программы worker-2](worker-2/Program.cs) + +Дополнительно создан файл [.gitignore](.gitignore) для того, чтобы не закоммитить в git ничего лишнего. + +## Настройка окружения + +Для связи двух приложений воспользуемся следующей схемой: + +1. Каталог `./data` должен быть примонтирован в каталог `/var/data` для программы 1. + Оттуда будут браться исходные данные. +2. Каталог `./result-1` должен быть примонтирован в каталог `/var/result` для программы 2. + Туда будут складываться промежуточные данные. +3. Каталог `./result-1` также должен быть примонтирован в каталог `/var/data` для программы 2. + Оттуда будут браться промежуточные результаты. +4. Каталог `./result` должен быть примонтирован в каталог `/var/result` для программы 2. + Туда будут складывать результаты финальной обработки. + +Для каждой программы были созданы файлы Dockerfile ([программа 1](worker-1/Dockerfile), [программа 2](worker-1/Dockerfile)) с подробным описанием процесса сборки. + +Был создан файл [docker-compose.yml](docker-compose.yml), в котором указан манифест для запуска распределённого приложения. + +Дополнительно был создан файл [.dockerignore](.dockerignore) и дополнен [.gitignore](.gitignore), чтобы исключить для сборки и коммита всё лишнее. + +## Сборка и запуск + +В каталог `./data` помещены 2 файла. +Произведение чисел в первом файле равна 1078 + +Для запуска приложения необходимо ввести команду `docker compose up ---build`. + +Результат запуска после сборки: + +``` +[+] Running 2/0 + - Container lab_2-worker-1-1 Created 0.0s + - Container lab_2-worker-2-1 Created 0.0s +Attaching to lab_2-worker-1-1, lab_2-worker-2-1 +lab_2-worker-1-1 exited with code 0 +lab_2-worker-2-1 exited with code 0 +``` + +В результате в каталоге `./result` создался файл `result.txt` с содержимым `1078`, что соответствует входным данным. + +Изменение значений в файлах из каталога `./data` также изменяет содержимое в файлах из каталогов `./result-1` и `./result`. diff --git a/tasks/mironov-eo/lab_2/data/another_data.txt b/tasks/mironov-eo/lab_2/data/another_data.txt new file mode 100644 index 0000000..de240ae --- /dev/null +++ b/tasks/mironov-eo/lab_2/data/another_data.txt @@ -0,0 +1,5 @@ +11 +15 +22 +27 +98 \ No newline at end of file diff --git a/tasks/mironov-eo/lab_2/data/data.txt b/tasks/mironov-eo/lab_2/data/data.txt new file mode 100644 index 0000000..99dc5fe --- /dev/null +++ b/tasks/mironov-eo/lab_2/data/data.txt @@ -0,0 +1,11 @@ +8 +8 +0 +0 +5 +5 +5 +3 +5 +3 +5 \ No newline at end of file diff --git a/tasks/mironov-eo/lab_2/docker-compose.yml b/tasks/mironov-eo/lab_2/docker-compose.yml new file mode 100644 index 0000000..ac0157b --- /dev/null +++ b/tasks/mironov-eo/lab_2/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3.1" +services: + worker-1: + build: ./worker-1 + volumes: + - ./data:/var/data + - ./result-1:/var/result + worker-2: + build: ./worker-2 + volumes: + - ./result-1:/var/data + - ./result:/var/result + depends_on: + - worker-1 diff --git a/tasks/mironov-eo/lab_2/worker-1/Dockerfile b/tasks/mironov-eo/lab_2/worker-1/Dockerfile new file mode 100644 index 0000000..6b79350 --- /dev/null +++ b/tasks/mironov-eo/lab_2/worker-1/Dockerfile @@ -0,0 +1,11 @@ +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env +WORKDIR /app + +COPY . ./ +RUN dotnet restore +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/aspnet:7.0 +WORKDIR /app +COPY --from=build-env /app/out . +ENTRYPOINT ["dotnet", "worker-1.dll"] diff --git a/tasks/mironov-eo/lab_2/worker-1/Program.cs b/tasks/mironov-eo/lab_2/worker-1/Program.cs new file mode 100644 index 0000000..f57f530 --- /dev/null +++ b/tasks/mironov-eo/lab_2/worker-1/Program.cs @@ -0,0 +1,8 @@ +Random random = new Random(); +var fileArray = Directory.GetFiles("/var/data"); +string file = fileArray[random.Next(fileArray.Length)]; +if (File.Exists("/var/result/data.txt")) +{ + File.Delete("/var/result/data.txt"); +} +File.Move(file, "/var/result/data.txt"); diff --git a/tasks/mironov-eo/lab_2/worker-1/worker-1.csproj b/tasks/mironov-eo/lab_2/worker-1/worker-1.csproj new file mode 100644 index 0000000..93ad7da --- /dev/null +++ b/tasks/mironov-eo/lab_2/worker-1/worker-1.csproj @@ -0,0 +1,11 @@ + + + + Exe + net7.0 + worker_1 + enable + enable + + + diff --git a/tasks/mironov-eo/lab_2/worker-2/Dockerfile b/tasks/mironov-eo/lab_2/worker-2/Dockerfile new file mode 100644 index 0000000..a76c7c2 --- /dev/null +++ b/tasks/mironov-eo/lab_2/worker-2/Dockerfile @@ -0,0 +1,11 @@ +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env +WORKDIR /app + +COPY . ./ +RUN dotnet restore +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/aspnet:7.0 +WORKDIR /app +COPY --from=build-env /app/out . +ENTRYPOINT ["dotnet", "worker-2.dll"] diff --git a/tasks/mironov-eo/lab_2/worker-2/Program.cs b/tasks/mironov-eo/lab_2/worker-2/Program.cs new file mode 100644 index 0000000..41806ba --- /dev/null +++ b/tasks/mironov-eo/lab_2/worker-2/Program.cs @@ -0,0 +1,20 @@ +var collection = File.ReadLines("/var/data/data.txt"); + +if (!collection.Any()) +{ + throw new ArgumentException("Incorrect file"); +} + +if (!int.TryParse(collection.First(), out int firstNumber)) +{ + throw new ArgumentException("Wrong number"); +} + +if (!int.TryParse(collection.Last(), out int lastNumber)) +{ + throw new ArgumentException("Wrong number"); +} + +var result = lastNumber * firstNumber; + +File.WriteAllText("/var/result/result.txt", result.ToString()); diff --git a/tasks/mironov-eo/lab_2/worker-2/worker-2.csproj b/tasks/mironov-eo/lab_2/worker-2/worker-2.csproj new file mode 100644 index 0000000..b90f9cb --- /dev/null +++ b/tasks/mironov-eo/lab_2/worker-2/worker-2.csproj @@ -0,0 +1,11 @@ + + + + Exe + net7.0 + worker_2 + enable + enable + + + From fd8b56ad1e3e5442d6a7f18668e54d4b5c1d9904 Mon Sep 17 00:00:00 2001 From: ruden Date: Sun, 3 Dec 2023 20:11:27 +0300 Subject: [PATCH 2/2] fix --- tasks/mironov-eo/lab_2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/mironov-eo/lab_2/README.md b/tasks/mironov-eo/lab_2/README.md index 16213f3..754b991 100644 --- a/tasks/mironov-eo/lab_2/README.md +++ b/tasks/mironov-eo/lab_2/README.md @@ -42,7 +42,7 @@ dotnet new console -o worker-2 4. Каталог `./result` должен быть примонтирован в каталог `/var/result` для программы 2. Туда будут складывать результаты финальной обработки. -Для каждой программы были созданы файлы Dockerfile ([программа 1](worker-1/Dockerfile), [программа 2](worker-1/Dockerfile)) с подробным описанием процесса сборки. +Для каждой программы были созданы файлы Dockerfile ([программа 1](worker-1/Dockerfile), [программа 2](worker-2/Dockerfile)) с подробным описанием процесса сборки. Был создан файл [docker-compose.yml](docker-compose.yml), в котором указан манифест для запуска распределённого приложения.