diff --git a/src/Microsoft.Tye.Core/DockerfileGenerator.cs b/src/Microsoft.Tye.Core/DockerfileGenerator.cs index b3e3fb7e5..e4503ff7b 100644 --- a/src/Microsoft.Tye.Core/DockerfileGenerator.cs +++ b/src/Microsoft.Tye.Core/DockerfileGenerator.cs @@ -124,6 +124,9 @@ public static void ApplyContainerDefaults(ApplicationBuilder application, Dotnet } container.ImageTag ??= project.Version?.Replace("+", "-") ?? "latest"; + + // Disable color in the logs + project.EnvironmentVariables.Add(new EnvironmentVariableBuilder("DOTNET_LOGGING__CONSOLE__DISABLECOLORS") { Value = "true" }); } public static void ApplyContainerDefaults(ApplicationBuilder application, DockerFileServiceBuilder project, ContainerInfo container) diff --git a/test/E2ETest/testassets/generate/apps-with-ingress.yaml b/test/E2ETest/testassets/generate/apps-with-ingress.yaml index 2907ea24d..1739d308f 100644 --- a/test/E2ETest/testassets/generate/apps-with-ingress.yaml +++ b/test/E2ETest/testassets/generate/apps-with-ingress.yaml @@ -21,6 +21,8 @@ spec: image: appa:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT @@ -82,6 +84,8 @@ spec: image: appb:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/dapr.yaml b/test/E2ETest/testassets/generate/dapr.yaml index 4772cc06c..eac4d0658 100644 --- a/test/E2ETest/testassets/generate/dapr.yaml +++ b/test/E2ETest/testassets/generate/dapr.yaml @@ -33,6 +33,8 @@ spec: image: dapr-test-project:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/dockerfile.yaml b/test/E2ETest/testassets/generate/dockerfile.yaml index f781a3ff6..4c0ee3eee 100644 --- a/test/E2ETest/testassets/generate/dockerfile.yaml +++ b/test/E2ETest/testassets/generate/dockerfile.yaml @@ -82,6 +82,8 @@ spec: image: frontend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/frontend-backend.yaml b/test/E2ETest/testassets/generate/frontend-backend.yaml index 7b4d009ec..3c5be5a6e 100644 --- a/test/E2ETest/testassets/generate/frontend-backend.yaml +++ b/test/E2ETest/testassets/generate/frontend-backend.yaml @@ -21,6 +21,8 @@ spec: image: test/backend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT @@ -82,6 +84,8 @@ spec: image: test/frontend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml b/test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml index be66e4f9d..e1f928ad9 100644 --- a/test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml +++ b/test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml @@ -21,6 +21,8 @@ spec: image: frontend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/generate-named-binding.yaml b/test/E2ETest/testassets/generate/generate-named-binding.yaml index f572187a4..344a1c0ed 100644 --- a/test/E2ETest/testassets/generate/generate-named-binding.yaml +++ b/test/E2ETest/testassets/generate/generate-named-binding.yaml @@ -21,6 +21,8 @@ spec: image: frontend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/generate-uri-dependency.yaml b/test/E2ETest/testassets/generate/generate-uri-dependency.yaml index 81ebb60b9..4fdcdfcd5 100644 --- a/test/E2ETest/testassets/generate/generate-uri-dependency.yaml +++ b/test/E2ETest/testassets/generate/generate-uri-dependency.yaml @@ -21,6 +21,8 @@ spec: image: frontend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/health-checks.yaml b/test/E2ETest/testassets/generate/health-checks.yaml index 3e881dbfa..1d3093c1a 100644 --- a/test/E2ETest/testassets/generate/health-checks.yaml +++ b/test/E2ETest/testassets/generate/health-checks.yaml @@ -21,6 +21,8 @@ spec: image: health-all:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*:8004' - name: PORT diff --git a/test/E2ETest/testassets/generate/multi-project.yaml b/test/E2ETest/testassets/generate/multi-project.yaml index d32bbc0b0..0022be53f 100644 --- a/test/E2ETest/testassets/generate/multi-project.yaml +++ b/test/E2ETest/testassets/generate/multi-project.yaml @@ -21,6 +21,8 @@ spec: image: test/backend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*:7000' - name: PORT @@ -97,6 +99,8 @@ spec: image: test/frontend:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*:8000' - name: PORT @@ -173,6 +177,8 @@ spec: image: test/worker:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: SERVICE__BACKEND__PROTOCOL value: 'http' - name: SERVICE__BACKEND__PORT diff --git a/test/E2ETest/testassets/generate/multirepo.yaml b/test/E2ETest/testassets/generate/multirepo.yaml index a724f7fa1..81023fa6b 100644 --- a/test/E2ETest/testassets/generate/multirepo.yaml +++ b/test/E2ETest/testassets/generate/multirepo.yaml @@ -21,6 +21,8 @@ spec: image: results:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT @@ -82,6 +84,8 @@ spec: image: worker:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/single-project-noregistry.yaml b/test/E2ETest/testassets/generate/single-project-noregistry.yaml index d084c22d9..078b09dc7 100644 --- a/test/E2ETest/testassets/generate/single-project-noregistry.yaml +++ b/test/E2ETest/testassets/generate/single-project-noregistry.yaml @@ -21,6 +21,8 @@ spec: image: test-project:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT diff --git a/test/E2ETest/testassets/generate/single-project.yaml b/test/E2ETest/testassets/generate/single-project.yaml index 6996fd03d..90a736e0d 100644 --- a/test/E2ETest/testassets/generate/single-project.yaml +++ b/test/E2ETest/testassets/generate/single-project.yaml @@ -21,6 +21,8 @@ spec: image: test/test-project:1.0.0 imagePullPolicy: Always env: + - name: DOTNET_LOGGING__CONSOLE__DISABLECOLORS + value: 'true' - name: ASPNETCORE_URLS value: 'http://*' - name: PORT