From 60d541e34ff86c12e73c70f25693add32db85ba9 Mon Sep 17 00:00:00 2001 From: Sergey Karmanov Date: Sat, 6 Sep 2025 14:25:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Docker=20Compose=20=D0=B4=D0=BB=D1=8F=20Pl?= =?UTF-8?q?aywright?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 3 ++- docker-compose-prod.yml | 4 +++- docker-compose-test.yml | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 docker-compose-test.yml diff --git a/.dockerignore b/.dockerignore index 38bece4..6138473 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,5 @@ -**/.dockerignore +**/.playwright +**/.dockerignore **/.env **/.git **/.gitignore diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index e4e541a..7a64cb2 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -10,6 +10,8 @@ services: - AzureAd:ClientSecret= - AzureAd:Domain=sfedu.onmicrosoft.com - AzureAd:CallbackPath=/signin-oidc - - TOKEN= + - MS_USERNAME=${MS_USERNAME} + - MS_PASSWORD=${MS_PASSWORD} + # - TOKEN= restart: always image: git.zetcraft.ru/serega404/sfeduschedule:main diff --git a/docker-compose-test.yml b/docker-compose-test.yml new file mode 100644 index 0000000..6ffb4eb --- /dev/null +++ b/docker-compose-test.yml @@ -0,0 +1,19 @@ +services: + app: + ports: + - '8088:8080' + container_name: SfeduSchedule + environment: + - AzureAd:Instance=https://login.microsoftonline.com/ + - AzureAd:TenantId=sfedu.ru + - AzureAd:ClientId= + - AzureAd:ClientSecret= + - AzureAd:Domain=sfedu.onmicrosoft.com + - AzureAd:CallbackPath=/signin-oidc + - MS_USERNAME= + - MS_PASSWORD= + # - TOKEN= + restart: unless-stopped + build: + context: ./SfeduSchedule + dockerfile: Dockerfile \ No newline at end of file