Skip to content

Commit

Permalink
now everything builds inside the container and forwards containers to…
Browse files Browse the repository at this point in the history
… the host when using docker compose through docker-out-of-docker.
macel94 committed Aug 18, 2024
1 parent b497c59 commit 8c53fb1
Showing 13 changed files with 254 additions and 80 deletions.
41 changes: 41 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-outside-of-docker
{
"name": "Docker outside of Docker",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0",
"features": {
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
// "version": "${templateOption:dockerVersion}",
// "enableNonRootDocker": "${templateOption:enableNonRootDocker}",
// "moby": "${templateOption:moby}"
},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/azure-cli:1": {}
},
"customizations": {
"vscode": {
"extensions": [
"ms-dotnettools.csdevkit",
"ms-mssql.mssql"
]
}
},

// Use this environment variable if you need to bind mount your local source code into a new container.
"remoteEnv": {
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [6350, 6401, 6351, 6402, 6379, 1433, 8080, 9090, 4317, 4318, 3000, 3100, 3200, 8889],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "docker --version",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
"remoteUser": "root"
}
Original file line number Diff line number Diff line change
@@ -7,16 +7,16 @@
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="*-*" />
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="*" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="*" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="*" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="*" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="*" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="*" />
<PackageReference Include="AspNetCore.SignalR.OpenTelemetry" Version="1.1.1" />
<PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Api" Version="*" />
</ItemGroup>

</Project>
29 changes: 14 additions & 15 deletions src/BlazorPong.SignalR/BlazorPong.SignalR.csproj
Original file line number Diff line number Diff line change
@@ -11,26 +11,25 @@

<ItemGroup>
<PackageReference Include="AspNetCore.SignalR.OpenTelemetry" Version="1.1.1" />
<PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
<PackageReference Include="OpenTelemetry.Api" Version="*" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.7.0-beta.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.7" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="*-*" />
<PackageReference Include="StackExchange.Redis" Version="2.7.27" />

<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="*-*" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="*" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="*" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="*" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="*" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="*" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="*" />
</ItemGroup>

<ItemGroup>
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.7" />
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.*-* " />
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.*-* " />
</ItemGroup>
7 changes: 4 additions & 3 deletions src/BlazorPong.Web/Client/Layout/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@inherits LayoutComponentBase
@using Microsoft.FluentUI.AspNetCore.Components.Extensions
@inherits LayoutComponentBase
<FluentDesignTheme @bind-Mode="@Mode"
OfficeColor="@OfficeColor"
OfficeColorChanged="@(e => { OfficeColor = e ?? OfficeColor.Default; StateHasChanged(); })"
@@ -70,7 +71,7 @@

@code
{
public DesignThemeModes Mode { get; set; }
DesignThemeModes Mode { get; set; }

public OfficeColor OfficeColor { get; set; }
OfficeColor OfficeColor { get; set; }
}
2 changes: 1 addition & 1 deletion src/BlazorPong.Web/Client/_Imports.razor
Original file line number Diff line number Diff line change
@@ -9,4 +9,4 @@
@using Microsoft.JSInterop
@using BlazorPong.Web.Client
@using BlazorPong.Web.Client.Layout
@using BlazorPong.Web.Components;
@using BlazorPong.Web.Components
15 changes: 7 additions & 8 deletions src/BlazorPong.Web/Server/BlazorPong.Web.Server.csproj
Original file line number Diff line number Diff line change
@@ -12,15 +12,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.7" />

<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="*-*" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="*" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="*" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="*" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="*" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="*" />
</ItemGroup>

<ItemGroup>
2 changes: 0 additions & 2 deletions src/BlazorPong.sln
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\README.md = ..\README.md
EndProjectSection
EndProject
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Blazorpong.Database.AzureSql", "Blazorpong.Database.AzureSql\Blazorpong.Database.AzureSql.sqlproj", "{45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{C8122674-880E-43F2-9DC3-B17BA34E02B6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorPong.Web.Client", "BlazorPong.Web\Client\BlazorPong.Web.Client.csproj", "{46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}"
Original file line number Diff line number Diff line change
@@ -121,8 +121,8 @@
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>
<Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<ItemGroup>
<Folder Include="Properties" />
<Folder Include="Snapshots" />
@@ -138,4 +138,14 @@
<None Include="Blazorpong.Database.AzureSql.localcontainer.publish.xml" />
<None Include="Snapshots\v0.dacpac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Condition="'$(NetCoreBuild)' == 'true'">
<Version>1.0.0</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(NETCoreTargetsPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" Condition="'$(NetCoreBuild)' == 'true'" />
<Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Name>Blazorpong.Database.AzureSql</Name>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>4.1</ProjectVersion>
<ProjectGuid>{45c7bd30-21b7-46f2-bacc-d90a1f1af7a9}</ProjectGuid>
<DSP>Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider</DSP>
<OutputType>Database</OutputType>
<RootPath>
</RootPath>
<RootNamespace>Blazorpong.Database.AzureSql</RootNamespace>
<AssemblyName>Blazorpong.Database.AzureSql</AssemblyName>
<ModelCollation>1033,CI</ModelCollation>
<DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
<DeployToDatabase>True</DeployToDatabase>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetLanguage>CS</TargetLanguage>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SqlServerVerification>False</SqlServerVerification>
<IncludeCompositeObjects>True</IncludeCompositeObjects>
<TargetDatabaseSet>True</TargetDatabaseSet>
<TargetFrameworkProfile />
<DefaultCollation>SQL_Latin1_General_CP1_CI_AS</DefaultCollation>
<AnsiNulls>False</AnsiNulls>
<QuotedIdentifier>False</QuotedIdentifier>
<TemporalHistoryRetentionEnabled>True</TemporalHistoryRetentionEnabled>
<IsLedgerOn>False</IsLedgerOn>
<QueryStoreCaptureMode>Auto</QueryStoreCaptureMode>
<QueryStoreDesiredState>ReadWrite</QueryStoreDesiredState>
<QueryStoreFlushInterval>900</QueryStoreFlushInterval>
<QueryStoreStatsInterval>60</QueryStoreStatsInterval>
<QueryStoreMaxPlansPerQuery>200</QueryStoreMaxPlansPerQuery>
<QueryStoreStaleQueryThreshold>30</QueryStoreStaleQueryThreshold>
<QueryStoreMaxStorageSize>100</QueryStoreMaxStorageSize>
<DbScopedConfigLegacyCardinalityEstimation>Off</DbScopedConfigLegacyCardinalityEstimation>
<DbScopedConfigMaxDOP>8</DbScopedConfigMaxDOP>
<DbScopedConfigParameterSniffing>On</DbScopedConfigParameterSniffing>
<DbScopedConfigOptimizerHotfixes>Off</DbScopedConfigOptimizerHotfixes>
<DelayedDurability>DISABLED</DelayedDurability>
<AutoCreateStatisticsIncremental>False</AutoCreateStatisticsIncremental>
<MemoryOptimizedElevateToSnapshot>False</MemoryOptimizedElevateToSnapshot>
<Containment>None</Containment>
<IsNestedTriggersOn>True</IsNestedTriggersOn>
<IsTransformNoiseWordsOn>False</IsTransformNoiseWordsOn>
<TwoDigitYearCutoff>2049</TwoDigitYearCutoff>
<NonTransactedFileStreamAccess>OFF</NonTransactedFileStreamAccess>
<TargetRecoveryTimePeriod>60</TargetRecoveryTimePeriod>
<TargetRecoveryTimeUnit>SECONDS</TargetRecoveryTimeUnit>
<IsChangeTrackingOn>False</IsChangeTrackingOn>
<IsChangeTrackingAutoCleanupOn>True</IsChangeTrackingAutoCleanupOn>
<ChangeTrackingRetentionPeriod>2</ChangeTrackingRetentionPeriod>
<ChangeTrackingRetentionUnit>Days</ChangeTrackingRetentionUnit>
<IsEncryptionOn>True</IsEncryptionOn>
<IsBrokerPriorityHonored>False</IsBrokerPriorityHonored>
<Trustworthy>False</Trustworthy>
<AutoUpdateStatisticsAsynchronously>False</AutoUpdateStatisticsAsynchronously>
<PageVerify>CHECKSUM</PageVerify>
<ServiceBrokerOption>EnableBroker</ServiceBrokerOption>
<DateCorrelationOptimizationOn>False</DateCorrelationOptimizationOn>
<Parameterization>SIMPLE</Parameterization>
<AllowSnapshotIsolation>True</AllowSnapshotIsolation>
<ReadCommittedSnapshot>True</ReadCommittedSnapshot>
<VardecimalStorageFormatOn>True</VardecimalStorageFormatOn>
<SupplementalLoggingOn>False</SupplementalLoggingOn>
<CompatibilityMode>150</CompatibilityMode>
<AnsiNullDefault>False</AnsiNullDefault>
<AnsiPadding>False</AnsiPadding>
<AnsiWarnings>False</AnsiWarnings>
<ArithAbort>False</ArithAbort>
<ConcatNullYieldsNull>False</ConcatNullYieldsNull>
<NumericRoundAbort>False</NumericRoundAbort>
<RecursiveTriggersEnabled>False</RecursiveTriggersEnabled>
<DatabaseChaining>False</DatabaseChaining>
<DatabaseState>ONLINE</DatabaseState>
<CloseCursorOnCommitEnabled>False</CloseCursorOnCommitEnabled>
<DefaultCursor>GLOBAL</DefaultCursor>
<AutoClose>False</AutoClose>
<AutoCreateStatistics>True</AutoCreateStatistics>
<AutoShrink>False</AutoShrink>
<AutoUpdateStatistics>True</AutoUpdateStatistics>
<TornPageDetection>False</TornPageDetection>
<DatabaseAccess>MULTI_USER</DatabaseAccess>
<Recovery>FULL</Recovery>
<EnableFullTextSearch>True</EnableFullTextSearch>
<DefaultFilegroup>PRIMARY</DefaultFilegroup>
<IncludeSchemaNameInFileName>True</IncludeSchemaNameInFileName>
<GenerateCreateScript>False</GenerateCreateScript>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CatalogCollation>SQL_Latin1_General_CP1_CI_AS</CatalogCollation>
<DataRetentionEnabled>False</DataRetentionEnabled>
<TreatTSqlWarningsAsErrors>True</TreatTSqlWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>
<Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<ItemGroup>
<Folder Include="Properties" />
<Folder Include="Snapshots" />
</ItemGroup>
<ItemGroup>
<Build Include="dbo.Room.sql" />
<Build Include="dbo.Client.sql" />
</ItemGroup>
<ItemGroup>
<RefactorLog Include="Blazorpong.Database.AzureSql.refactorlog" />
</ItemGroup>
<ItemGroup>
<None Include="Blazorpong.Database.AzureSql.localcontainer.publish.xml" />
<None Include="Snapshots\v0.dacpac" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions src/docker-compose.nobuild.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# x-logging: &default-logging
# driver: loki
# options:
# loki-url: 'http://localhost:3100/api/prom/push'
# loki-pipeline-stages: |
# - multiline:
# firstline: '^\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2}'
# max_wait_time: 3s
# - regex:
# expression: '^(?P<time>\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2},d{3}) (?P<message>(?s:.*))$$'

version: '3'

services:
webapp:
image: ghcr.io/macel94/cloudnativeblazorpong/blazorpong-web
2 changes: 0 additions & 2 deletions src/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -9,8 +9,6 @@
# - regex:
# expression: '^(?P<time>\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2},d{3}) (?P<message>(?s:.*))$$'

# version: '3.8'

# services:
# webapp:
# image: ${DOCKER_REGISTRY-}blazorpongwebserver
48 changes: 24 additions & 24 deletions src/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
# - regex:
# expression: '^(?P<time>\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2},d{3}) (?P<message>(?s:.*))$$'

version: '3'
# version: '3'

services:
webapp:
@@ -64,8 +64,8 @@ services:
# "-config", "/configuration/config.yaml"
# ]
# volumes:
# - "./.dapr/components/:/components"
# - "./.dapr/:/configuration"
# - "${LOCAL_WORKSPACE_FOLDER}/src/.dapr/components/:/components"
# - "${LOCAL_WORKSPACE_FOLDER}/src/.dapr/:/configuration"
# depends_on:
# - signalr

@@ -79,7 +79,7 @@ services:
image: "mcr.microsoft.com/azure-sql-edge:latest"
container_name: azuresql
volumes:
- ./Blazorpong.Database.AzureSql/Snapshots:/backup:ro
- ${LOCAL_WORKSPACE_FOLDER}/src/Blazorpong.Database.AzureSql/Snapshots:/backup:ro
environment:
- ACCEPT_EULA=Y
- MSSQL_SA_PASSWORD=yourStrong(!)Password
@@ -88,27 +88,27 @@ services:
ports:
- "1433:1433"

dapr-dashboard:
image: "daprio/dashboard:latest"
container_name: dapr-dashboard
command: [ "--docker-compose=true",
"--components-path=/home/nonroot/components",
"--config-path=/home/nonroot/configuration",
"--docker-compose-path=/home/nonroot/docker-compose.yml" ]
ports:
- "8080:8080"
volumes:
- "./.dapr/components/:/home/nonroot/components"
- "./.dapr/:/home/nonroot/configuration"
- ./docker-compose.yml:/home/nonroot/docker-compose.yml
# dapr-dashboard:
# image: "daprio/dashboard:latest"
# container_name: dapr-dashboard
# command: [ "--docker-compose=true",
# "--components-path=/home/nonroot/components",
# "--config-path=/home/nonroot/configuration",
# "--docker-compose-path=/home/nonroot/docker-compose.yml" ]
# ports:
# - "8080:8080"
# volumes:
# - "${LOCAL_WORKSPACE_FOLDER}/src/.dapr/components/:/home/nonroot/components"
# - "${LOCAL_WORKSPACE_FOLDER}/src/.dapr/:/home/nonroot/configuration"
# - ${LOCAL_WORKSPACE_FOLDER}/src/docker-compose.yml:/home/nonroot/docker-compose.yml

prometheus:
image: prom/prometheus:latest
container_name: prometheus
ports:
- "9090"
volumes:
- ./Observability/prometheus.yaml:/etc/prometheus/prometheus.yaml
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/prometheus.yaml:/etc/prometheus/prometheus.yaml

collector:
image: otel/opentelemetry-collector-contrib:latest
@@ -119,7 +119,7 @@ services:
- "4318:4318"
- "8889"
volumes:
- ./Observability/otel-collector-config.yaml:/etc/collector.yaml
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/otel-collector-config.yaml:/etc/collector.yaml
depends_on:
- tempo
- prometheus
@@ -130,7 +130,7 @@ services:
container_name: tempo
command: [ "-config.file=/etc/tempo.yaml" ]
volumes:
- ./Observability/tempo.yaml:/etc/tempo.yaml
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/tempo.yaml:/etc/tempo.yaml
# logging: *default-logging
ports:
- "3200" # tempo
@@ -144,9 +144,9 @@ services:
ports:
- "3000:3000"
volumes:
- ./Observability/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
- ./Observability/dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml
- ./Observability/dashboards:/etc/grafana/dashboards
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/dashboards:/etc/grafana/dashboards
environment:
- GF_AUTH_ANONYMOUS_ENABLED=true
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
@@ -164,4 +164,4 @@ services:
ports:
- "3100:3100"
volumes:
- ./Observability/loki.yaml:/etc/loki.yaml
- ${LOCAL_WORKSPACE_FOLDER}/src/Observability/loki.yaml:/etc/loki.yaml

0 comments on commit 8c53fb1

Please sign in to comment.