From 430fa21a4759d7fc80d49da23206d4611e89f328 Mon Sep 17 00:00:00 2001 From: Artem-Darius Weber Date: Thu, 17 Apr 2025 14:03:08 +0300 Subject: [PATCH] =?UTF-8?q?(lab=205)=20feat:=20task-12:=20=D0=9E=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20Makefile=20=D0=B8?= =?UTF-8?q?=20compose.yaml=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=B4=D0=B4?= =?UTF-8?q?=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20Fav?= =?UTF-8?q?oriteLangFP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 13 ++++++++++--- compose.yaml | 9 +++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 60ad736..407e812 100644 --- a/Makefile +++ b/Makefile @@ -38,11 +38,14 @@ run-lab5-number-examples: run-lab5-favorite-lang: dotnet run --project "lab 5/FavoriteLang/FavoriteLang.fsproj" +run-lab5-favorite-lang-fp: + dotnet run --project "lab 5/FavoriteLangFP/FavoriteLangFP.fsproj" + # Запуск Lab 5 run-all-lab5: run-lab5-hello-world run-lab5-quadratic-equation run-lab5-circle-cylinder \ run-lab5-number-operations run-lab5-recursion-types run-lab5-function-factory \ run-lab5-number-traversal run-lab5-lambda-traversal run-lab5-conditional-traversal \ - run-lab5-number-examples run-lab5-favorite-lang + run-lab5-number-examples run-lab5-favorite-lang run-lab5-favorite-lang-fp help: @echo "Доступные команды:" @@ -68,6 +71,7 @@ help: @echo " make run-lab5-conditional-traversal - Запустить пример с условным обходом" @echo " make run-lab5-number-examples - Запустить практические примеры работы с числами" @echo " make run-lab5-favorite-lang - Запустить программу о любимом языке программирования" + @echo " make run-lab5-favorite-lang-fp - Запустить программу о любимом языке с суперпозицией и каррированием" clean: dotnet clean @@ -83,13 +87,13 @@ lab5-docker-build: docker compose build lab5-hello-world lab5-quadratic-equation lab5-circle-and-cylinder \ lab5-number-operations lab5-recursion-types lab5-function-factory \ lab5-number-traversal lab5-lambda-traversal lab5-conditional-traversal \ - lab5-number-examples lab5-favorite-lang + lab5-number-examples lab5-favorite-lang lab5-favorite-lang-fp lab5-docker-run: docker compose up lab5-hello-world lab5-quadratic-equation lab5-circle-and-cylinder \ lab5-number-operations lab5-recursion-types lab5-function-factory \ lab5-number-traversal lab5-lambda-traversal lab5-conditional-traversal \ - lab5-number-examples lab5-favorite-lang + lab5-number-examples lab5-favorite-lang lab5-favorite-lang-fp # Docker lab 5 отдельные программы lab5-hello-world-docker-run: @@ -125,6 +129,9 @@ lab5-number-examples-docker-run: lab5-favorite-lang-docker-run: docker compose up lab5-favorite-lang +lab5-favorite-lang-fp-docker-run: + docker compose up lab5-favorite-lang-fp + ci-local: circleci config validate circleci local execute diff --git a/compose.yaml b/compose.yaml index f1afe5e..1c6f39e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -107,4 +107,13 @@ services: volumes: - ./lab 5/FavoriteLang:/app stdin_open: true + tty: true + + lab5-favorite-lang-fp: + build: + context: ./lab 5/FavoriteLangFP + dockerfile: ../../Individual Task 1/Dockerfile + volumes: + - ./lab 5/FavoriteLangFP:/app + stdin_open: true tty: true \ No newline at end of file