AI/myAi
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Changes
Build and Push Docker Images / build (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Gelu Mihes
2026-05-07 17:09:24 +03:00
parent 898f4987a5
commit fe3dbc37ad
16 changed files with 939 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose/docker-compose.dcproj
-6
View File
@@ -20,11 +20,5 @@
<DependentUpon>.env</DependentUpon>
</None>
<None Include="docker-compose.yml" />
<None Include="docker-compose.staging.yml">
<DependentUpon>docker-compose.yml</DependentUpon>
</None>
<None Include="docker-compose.production.yml">
<DependentUpon>docker-compose.yml</DependentUpon>
</None>
</ItemGroup>
</Project>
docker-compose/docker-compose.production.yml
-94
View File
@@ -1,94 +0,0 @@
services:
api:
image: registry.easysoft.ro/apps/myai-api:production
container_name: myai-api
environment:
- APP_ENVIRONMENT_NAME=easySoft.ro-Production
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://+:8080
- Smtp__Host=mail.easysoft.ro
- Smtp__Port=587
- Smtp__Username=no-reply@myai.ro
- Smtp__Password=${Smtp__Password}
- Smtp__UseStartTls=true
- FileStorage__Path=Files
- FileStorage__DefaultFileName=
- FileStorage__ToEmail=webmaster@myai.ro
- FileStorage__SubjectPrefix=[File Download]
- Captcha__Provider=Recaptcha
- Captcha__SecretKey=${Captcha__SecretKey}
- Captcha__PublicKey=6LfR3NUsAAAAAH1bFYTKlgwp9SBKf5IRB2IOrhBe
- Captcha__MinimumScore=0.5
- Google__TagManagerId=GTM-NHWC9N2K
- Google__MapKey=
- Contact__ToEmail=contact@myai.ro
- Contact__SubjectPrefix=[Contact]
- Subscribe__ToEmail=contact@myai.ro
- Subscribe__SubjectPrefix=[Subscribe]
- Cors__AllowedOrigins__0=https://myai.ro
- Logging__LogLevel__Default=Information
- Logging__LogLevel__Microsoft=Warning
- Logging__LogLevel__Microsoft__AspNetCore=Warning
- Logging__LogLevel__Api=Information
- Serilog__WriteTo__2__Args__fromEmail=no-reply@myai.ro
- Serilog__WriteTo__2__Args__toEmail=webmaster@myai.ro
- Serilog__WriteTo__2__Args__mailServer=mail.easysoft.ro
- Serilog__WriteTo__2__Args__networkCredential__userName=no-reply@myai.ro
- Serilog__WriteTo__2__Args__networkCredential__password=${Smtp__Password}
- Serilog__WriteTo__2__Args__port=587
- Serilog__WriteTo__2__Args__enableSsl=true
- Ai__OpenAI__ApiKey=${Ai__OpenAI__ApiKey}
- Ai__OpenAI__ChatModel=${Ai__OpenAI__ChatModel}
- Ai__OpenAI__EmbeddingModel=${Ai__OpenAI__EmbeddingModel}
- Ai__OpenAI__TimeoutSeconds=${Ai__OpenAI__TimeoutSeconds}
# Database (shared)
- Database__Host=${Database__Host}
- Database__Port=${Database__Port}
- Database__Name=${Database__Name}
- Database__User=${Database__User}
- Database__Password=${Database__Password}
- Database__TrustServerCertificate=${Database__TrustServerCertificate}
# Internal API protection
- InternalApi__ApiKey=${InternalApi__ApiKey}
- InternalApi__RequireApiKey=${InternalApi__RequireApiKey}
# CvMatcher API settings used by this service
- CvMatcherApi__BaseUrl=${CvMatcherApi__BaseUrl}
- CvMatcherApi__InternalApiKey=${CvMatcherApi__InternalApiKey}
# RAG settings
- Rag__MaxFileSizeMb=${Rag__MaxFileSizeMb}
- Rag__ChunkSize=${Rag__ChunkSize}
- Rag__ChunkOverlap=${Rag__ChunkOverlap}
- Rag__MaxTextChars=${Rag__MaxTextChars}
- Rag__DefaultTopK=${Rag__DefaultTopK}
- Rag__MaxTopK=${Rag__MaxTopK}
- Rag__ClassifyWithAi=${Rag__ClassifyWithAi}
volumes:
- myai_api_logs:/app/logs
- /opt/myai/files:/app/Files
networks:
- myai-network
extra_hosts:
- "mail.easysoft.ro:10.0.0.225"
restart: unless-stopped
labels:
- "com.centurylinklabs.watchtower.enable=true"
web:
image: registry.easysoft.ro/apps/myai-web:production
container_name: myai-web
depends_on:
- api
ports:
- "5140:8080"
networks:
- myai-network
restart: unless-stopped
labels:
- "com.centurylinklabs.watchtower.enable=true"
networks:
myai-network:
driver: bridge
volumes:
myai_api_logs:
docker-compose/docker-compose.staging.yml
-79
View File
@@ -1,79 +0,0 @@
services:
api:
image: registry.easysoft.ro/apps/myai-api:staging
container_name: myai-api
environment:
- APP_ENVIRONMENT_NAME=myAi.ro-Staging
- ASPNETCORE_ENVIRONMENT=Staging
- ASPNETCORE_URLS=http://+:8080
- Smtp__Host=mail.easysoft.ro
- Smtp__Port=587
- Smtp__Username=no-reply-staging@easysoft.ro
- Smtp__Password=${Smtp__Password}
- Smtp__UseStartTls=true
- FileStorage__Path=Files
- FileStorage__DefaultFileName=
- FileStorage__ToEmail=webmaster-staging@easysoft.ro
- FileStorage__SubjectPrefix=[File Download]
- Captcha__Provider=Recaptcha
- Captcha__SecretKey=${Captcha__SecretKey}
- Captcha__PublicKey=6LfR3NUsAAAAAH1bFYTKlgwp9SBKf5IRB2IOrhBe
- Captcha__MinimumScore=0.5
- Google__TagManagerId=GTM-NHWC9N2K
- Google__MapKey=
- Contact__ToEmail=contact-staging@easysoft.ro
- Contact__SubjectPrefix=[Contact]
- Subscribe__ToEmail=contact-staging@easysoft.ro
- Subscribe__SubjectPrefix=[Subscribe]
- Cors__AllowedOrigins__0=https://myai.easysoft.ro
- Logging__LogLevel__Default=Information
- Logging__LogLevel__Microsoft=Warning
- Logging__LogLevel__Microsoft__AspNetCore=Warning
- Logging__LogLevel__Api=Information
- Serilog__WriteTo__2__Args__fromEmail=no-reply-staging@easysoft.ro
- Serilog__WriteTo__2__Args__toEmail=webmaster-staging@easysoft.ro
- Serilog__WriteTo__2__Args__mailServer=mail.easysoft.ro
- Serilog__WriteTo__2__Args__networkCredential__userName=no-reply-staging@easysoft.ro
- Serilog__WriteTo__2__Args__networkCredential__password=${Smtp__Password}
- Serilog__WriteTo__2__Args__port=587
- Serilog__WriteTo__2__Args__enableSsl=true
- OpenAI__ApiKey=${OpenAI__ApiKey}
- OpenAI__ChatModel=gpt-4o-mini
- OpenAI__EmbeddingModel=text-embedding-3-small
- OpenAI__TimeoutSeconds=60
- Rag__MaxPdfSizeMb=5
- Rag__ChunkSize=900
- Rag__ChunkOverlap=150
- Rag__CvTtlMinutes=60
- Rag__MaxJobTextChars=20000
- Rag__TopK=6
volumes:
- myai_api_logs:/app/logs
- /opt/myai/files:/app/Files
networks:
- myai-network
extra_hosts:
- "mail.easysoft.ro:10.0.0.225"
restart: unless-stopped
labels:
- "com.centurylinklabs.watchtower.enable=true"
web:
image: registry.easysoft.ro/apps/myai-web:staging
container_name: myai-web
depends_on:
- api
ports:
- "5140:8080"
networks:
- myai-network
restart: unless-stopped
labels:
- "com.centurylinklabs.watchtower.enable=true"
networks:
myai-network:
driver: bridge
volumes:
myai_api_logs:
docker-compose/docker-compose.yml
+145 -22
View File
@@ -11,20 +11,56 @@ services:
env_file:
- .env
environment:
# ASP.NET
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Development}
- ASPNETCORE_URLS=http://+:8080
- # Database settings (read by the apps as Database:Host/Port/Name/User/Password)
- Database__Host=${Database__Host:-mssql}
- ASPNETCORE_URLS=${ASPNETCORE_URLS:-http://+:8080}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.local}
- LogEnvironmentOnStartup=${LogEnvironmentOnStartup:-true}
# Database: matches rag-api appsettings Database section
- Database__Host=${Database__Host:-sqlserver}
- Database__Port=${Database__Port:-1433}
- Database__Name=${Database__Name:-MyAiCvMatcher}
- Database__Name=${Database__Name:-MyAiDb}
- Database__User=${Database__User:-sa}
- Database__Password=${Database__Password:-Your_strong_password123}
- Database__Password=${Database__Password:-}
- Database__TrustServerCertificate=${Database__TrustServerCertificate:-true}
- InternalApi__RequireApiKey=true
# InternalApi: matches rag-api appsettings InternalApi section
- InternalApi__ApiKey=${InternalApi__ApiKey:-change-this-internal-key}
- InternalApi__RequireApiKey=${InternalApi__RequireApiKey:-false}
# Rag: matches rag-api appsettings Rag section
- Rag__MaxFileSizeMb=${Rag__MaxFileSizeMb:-8}
- Rag__ChunkSize=${Rag__ChunkSize:-900}
- Rag__ChunkOverlap=${Rag__ChunkOverlap:-150}
- Rag__MaxTextChars=${Rag__MaxTextChars:-60000}
- Rag__DefaultTopK=${Rag__DefaultTopK:-20}
- Rag__MaxTopK=${Rag__MaxTopK:-50}
- Rag__ClassifyWithAi=${Rag__ClassifyWithAi:-false}
# Ai: matches rag-api appsettings Ai section
- Ai__Provider=${Ai__Provider:-OpenAI}
- Ai__OpenAI__ApiKey=${Ai__OpenAI__ApiKey:-}
- Ai__OpenAI__ChatModel=${Ai__OpenAI__ChatModel:-gpt-4o-mini}
- Ai__OpenAI__EmbeddingModel=${Ai__OpenAI__EmbeddingModel:-text-embedding-3-small}
- Ai__OpenAI__TimeoutSeconds=${Ai__OpenAI__TimeoutSeconds:-90}
- Ai__Ollama__BaseUrl=${Ai__Ollama__BaseUrl:-http://host.docker.internal:11434}
- Ai__Ollama__ChatModel=${Ai__Ollama__ChatModel:-llama3.1:8b}
- Ai__Ollama__EmbeddingModel=${Ai__Ollama__EmbeddingModel:-nomic-embed-text}
- Ai__Ollama__TimeoutSeconds=${Ai__Ollama__TimeoutSeconds:-180}
# Logging / Serilog
- Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
- Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
- Logging__LogLevel__Microsoft__AspNetCore=${Logging__LogLevel__Microsoft__AspNetCore:-Warning}
- Logging__LogLevel__Api=${Logging__LogLevel__Api:-Information}
- Serilog__WriteTo__2__Args__fromEmail=${Serilog__WriteTo__2__Args__fromEmail:-}
- Serilog__WriteTo__2__Args__toEmail=${Serilog__WriteTo__2__Args__toEmail:-}
- Serilog__WriteTo__2__Args__mailServer=${Serilog__WriteTo__2__Args__mailServer:-}
- Serilog__WriteTo__2__Args__networkCredential__userName=${Serilog__WriteTo__2__Args__networkCredential__userName:-}
- Serilog__WriteTo__2__Args__networkCredential__password=${Serilog__WriteTo__2__Args__networkCredential__password:-}
- Serilog__WriteTo__2__Args__port=${Serilog__WriteTo__2__Args__port:-587}
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
networks:
- myai-network
restart: unless-stopped
@@ -41,47 +77,133 @@ services:
env_file:
- .env
environment:
# ASP.NET
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Development}
- ASPNETCORE_URLS=http://+:8080
- # Database settings (cv-matcher uses same keys)
- Database__Host=${Database__Host:-mssql}
- ASPNETCORE_URLS=${ASPNETCORE_URLS:-http://+:8080}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.local}
- LogEnvironmentOnStartup=${LogEnvironmentOnStartup:-true}
# Database: matches cv-matcher-api appsettings Database section
- Database__Host=${Database__Host:-sqlserver}
- Database__Port=${Database__Port:-1433}
- Database__Name=${Database__Name:-MyAiCvMatcher}
- Database__Name=${Database__Name:-MyAiDb}
- Database__User=${Database__User:-sa}
- Database__Password=${Database__Password:-Your_strong_password123}
- Database__Password=${Database__Password:-}
- Database__TrustServerCertificate=${Database__TrustServerCertificate:-true}
- InternalApi__RequireApiKey=true
# InternalApi: matches cv-matcher-api appsettings InternalApi section
- InternalApi__ApiKey=${InternalApi__ApiKey:-change-this-internal-key}
- RagApi__BaseUrl=http://rag-api:8080
- RagApi__InternalApiKey=${InternalApi__ApiKey:-change-this-internal-key}
- InternalApi__RequireApiKey=${InternalApi__RequireApiKey:-false}
# RagApi: matches cv-matcher-api appsettings RagApi section
# IMPORTANT: this must use the container-internal port, not the host-mapped port.
- RagApi__BaseUrl=${RagApi__BaseUrl:-http://rag-api:8080}
- RagApi__InternalApiKey=${RagApi__InternalApiKey:-${InternalApi__ApiKey:-change-this-internal-key}}
# Ai: matches cv-matcher-api appsettings Ai section
- Ai__Provider=${Ai__Provider:-OpenAI}
- Ai__OpenAI__ApiKey=${Ai__OpenAI__ApiKey:-}
- Ai__OpenAI__ChatModel=${Ai__OpenAI__ChatModel:-gpt-4o-mini}
- Ai__OpenAI__TimeoutSeconds=${Ai__OpenAI__TimeoutSeconds:-90}
- Ai__Ollama__BaseUrl=${Ai__Ollama__BaseUrl:-http://host.docker.internal:11434}
- Ai__Ollama__ChatModel=${Ai__Ollama__ChatModel:-llama3.1:8b}
- Ai__Ollama__TimeoutSeconds=${Ai__Ollama__TimeoutSeconds:-180}
# Matcher: matches cv-matcher-api appsettings Matcher section
- Matcher__TopK=${Matcher__TopK:-10}
- Matcher__DeepScoreTopN=${Matcher__DeepScoreTopN:-5}
- Matcher__MaxJobTextChars=${Matcher__MaxJobTextChars:-60000}
# Logging / Serilog
- Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
- Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
- Logging__LogLevel__Microsoft__AspNetCore=${Logging__LogLevel__Microsoft__AspNetCore:-Warning}
- Logging__LogLevel__Api=${Logging__LogLevel__Api:-Information}
- Serilog__WriteTo__2__Args__fromEmail=${Serilog__WriteTo__2__Args__fromEmail:-}
- Serilog__WriteTo__2__Args__toEmail=${Serilog__WriteTo__2__Args__toEmail:-}
- Serilog__WriteTo__2__Args__mailServer=${Serilog__WriteTo__2__Args__mailServer:-}
- Serilog__WriteTo__2__Args__networkCredential__userName=${Serilog__WriteTo__2__Args__networkCredential__userName:-}
- Serilog__WriteTo__2__Args__networkCredential__password=${Serilog__WriteTo__2__Args__networkCredential__password:-}
- Serilog__WriteTo__2__Args__port=${Serilog__WriteTo__2__Args__port:-587}
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
networks:
- myai-network
restart: unless-stopped
api:
depends_on:
- cv-matcher-api
build:
context: ..
dockerfile: api/Dockerfile
container_name: myai-api
depends_on:
- cv-matcher-api
ports:
- "8080:8080"
env_file:
- ../api/.env
- .env
# Keep this only if api/.env contains api-specific overrides not present in docker-compose/.env.
# - ../api/.env
environment:
# ASP.NET
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Development}
- ASPNETCORE_URLS=${ASPNETCORE_URLS:-http://+:8080}
- Cors__AllowedOrigins__0=http://localhost:5000
- Cors__AllowedOrigins__1=http://web:8080
- CvMatcherApi__BaseUrl=http://cv-matcher-api:8080
- CvMatcherApi__InternalApiKey=${CvMatcherApi__InternalApiKey:-change-this-internal-key}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.local}
- LogEnvironmentOnStartup=${LogEnvironmentOnStartup:-true}
# Google: matches api appsettings Google section
- Google__TagManagerId=${Google__TagManagerId:-}
- Google__MapKey=${Google__MapKey:-}
# Contact / Subscribe: matches api appsettings Contact and Subscribe sections
- Contact__ToEmail=${Contact__ToEmail:-}
- Contact__FromEmail=${Contact__FromEmail:-${Smtp__Username:-}}
- Contact__SubjectPrefix=${Contact__SubjectPrefix:-}
- Subscribe__ToEmail=${Subscribe__ToEmail:-}
- Subscribe__SubjectPrefix=${Subscribe__SubjectPrefix:-}
# SMTP: matches api appsettings Smtp section
- Smtp__Host=${Smtp__Host:-mail.example.com}
- Smtp__Port=${Smtp__Port:-587}
- Smtp__Username=${Smtp__Username:-}
- Smtp__Password=${Smtp__Password:-}
- Smtp__UseStartTls=${Smtp__UseStartTls:-false}
# Captcha: matches api appsettings Captcha section
- Captcha__Provider=${Captcha__Provider:-Recaptcha}
- Captcha__SecretKey=${Captcha__SecretKey:-}
- Captcha__PublicKey=${Captcha__PublicKey:-}
- Captcha__MinimumScore=${Captcha__MinimumScore:-0.5}
# FileStorage: matches api appsettings FileStorage section
- FileStorage__Path=${FileStorage__Path:-Files}
- FileStorage__DefaultFileName=${FileStorage__DefaultFileName:-}
- FileStorage__ToEmail=${FileStorage__ToEmail:-}
- FileStorage__FromEmail=${FileStorage__FromEmail:-${Smtp__Username:-}}
- FileStorage__SubjectPrefix=${FileStorage__SubjectPrefix:-[File Download]}
# CvMatcherApi: matches api appsettings CvMatcherApi section
- CvMatcherApi__BaseUrl=${CvMatcherApi__BaseUrl:-http://cv-matcher-api:8080}
- CvMatcherApi__InternalApiKey=${CvMatcherApi__InternalApiKey:-${InternalApi__ApiKey:-change-this-internal-key}}
# CORS: not in the uploaded api appsettings, but used by your API startup config.
- Cors__AllowedOrigins__0=${Cors__AllowedOrigins__0:-http://localhost:5000}
- Cors__AllowedOrigins__1=${Cors__AllowedOrigins__1:-http://web:8080}
# Logging / Serilog
- Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
- Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
- Logging__LogLevel__Microsoft__AspNetCore=${Logging__LogLevel__Microsoft__AspNetCore:-Warning}
- Logging__LogLevel__Api=${Logging__LogLevel__Api:-Information}
- Serilog__WriteTo__2__Args__fromEmail=${Serilog__WriteTo__2__Args__fromEmail:-}
- Serilog__WriteTo__2__Args__toEmail=${Serilog__WriteTo__2__Args__toEmail:-}
- Serilog__WriteTo__2__Args__mailServer=${Serilog__WriteTo__2__Args__mailServer:-}
- Serilog__WriteTo__2__Args__networkCredential__userName=${Serilog__WriteTo__2__Args__networkCredential__userName:-}
- Serilog__WriteTo__2__Args__networkCredential__password=${Serilog__WriteTo__2__Args__networkCredential__password:-}
- Serilog__WriteTo__2__Args__port=${Serilog__WriteTo__2__Args__port:-587}
- Serilog__WriteTo__2__Args__enableSsl=${Serilog__WriteTo__2__Args__enableSsl:-true}
volumes:
- ../api/logs:/app/logs
- ${FileStorage__Path:-../Files}:/app/Files
networks:
- myai-network
restart: unless-stopped
@@ -100,10 +222,11 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Development}
- ASPNETCORE_URLS=${ASPNETCORE_URLS:-http://+:8080}
- APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.local}
networks:
- myai-network
restart: unless-stopped
networks:
myai-network:
driver: bridge
driver: bridge