diff --git a/containers/.env b/containers/.env index e8a2d29..6b9921d 100644 --- a/containers/.env +++ b/containers/.env @@ -11,3 +11,7 @@ MSSQL_SA_PASSWORD="P@ssword123!" # OpenTelemetry API Key SEQ_FIRSTRUN_NOAUTHENTICATION="TRUE" SEQ_STORAGE_SECRETKEY="XsL3FMvDWrPVqiIkzSkKEojF/Z/OpDJV4FkRNje0G4s=" + +# Ollama service +OLLAMA_API_KEY="1234567890" +OLLAMA_MODEL="llama3" diff --git a/containers/docker-compose-common.yml b/containers/docker-compose-common.yml index 95914ac..9a1470d 100644 --- a/containers/docker-compose-common.yml +++ b/containers/docker-compose-common.yml @@ -1,6 +1,32 @@ services: # Development Resources + mssql: + build: ./mssql + environment: + SA_PASSWORD: "${MSSQL_SA_PASSWORD}" + ACCEPT_EULA: "${ACCEPT_EULA}" + MSSQL_AGENT_ENABLED: "true" + ports: + - "10433:1433" + container_name: SqlServerDev + #restart: unless-stopped + hostname: mssql + + cosmosdb: + image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator + environment: + AZURE_COSMOS_EMULATOR_PARTITION_COUNT: "3" + AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE: "true" + ports: + - "8081:8081" + - "10251:10251" + - "10252:10252" + - "10253:10253" + container_name: CosmoDbDev + #restart: unless-stopped + hostname: cosmosdb + # Redis Cache redis: image: redis:latest @@ -29,6 +55,8 @@ services: SEQ_STORAGE_SECRETKEY: "${SEQ_STORAGE_SECRETKEY}" ports: - "10150:80" # OpenTelemetry, Update port if needed + volumes: + - seq-data:/data #restart: unless-stopped container_name: OtelCollectorDev @@ -99,3 +127,7 @@ services: networks: sb-emulator: + +volumes: + seq-data: + driver: local \ No newline at end of file diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml index 7662001..78f67cd 100644 --- a/containers/docker-compose.yml +++ b/containers/docker-compose.yml @@ -1,14 +1 @@ -services: - -# SQL Server instance - mssql: - build: ./mssql - environment: - SA_PASSWORD: "${MSSQL_SA_PASSWORD}" - ACCEPT_EULA: "${ACCEPT_EULA}" - MSSQL_AGENT_ENABLED: "true" - ports: - - "4110:1433" # SQL Server, Update port if needed - container_name: ExampleSql - hostname: mssql - +# if needed add project specific resources and enable the line in docker_setup.ps1 and docker_down.ps1 diff --git a/docker_down.ps1 b/docker_down.ps1 index 08bf741..e6b17cd 100644 --- a/docker_down.ps1 +++ b/docker_down.ps1 @@ -5,7 +5,7 @@ if (Get-Command docker -ErrorAction SilentlyContinue) { ## Teardown the vs multi-container docker-compose -f "./containers/docker-compose-common.yml" -p common_shared down - docker-compose -f "./containers/docker-compose.yml" -p dotnet_example down + #docker-compose -f "./containers/docker-compose.yml" -p project down } Write-Host "Docker Teardown Complete..." diff --git a/docker_setup.ps1 b/docker_setup.ps1 index 2adab03..f2b3d87 100644 --- a/docker_setup.ps1 +++ b/docker_setup.ps1 @@ -5,7 +5,7 @@ if (Get-Command docker -ErrorAction SilentlyContinue) { ## Start the vs multi-container docker-compose -f "./containers/docker-compose-common.yml" -p common_shared up -d - docker-compose -f "./containers/docker-compose.yml" -p dotnet_example up -d + #docker-compose -f "./containers/docker-compose.yml" -p project up -d } Write-Host "Docker images and container setup completed."