Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

Removing color from deployed app console logs #577

Merged
merged 4 commits into from
Jul 14, 2020
Merged

Removing color from deployed app console logs #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34f46b0
Removing color from deployed app console logs
RiskRunner0 Jul 13, 2020
3cef0ae
Updating generated testassets for E2E test fixes wrt Type Serialization.
RiskRunner0 Jul 13, 2020
f48ed58
Removing color for ApplyContainerDefaults with DockerFileServiceBuild…
RiskRunner0 Jul 13, 2020
8907186
Removing color dependent code in DockerfileGenerator.cs for DockerFil…
RiskRunner0 Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Microsoft.Tye.Core/DockerfileGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions test/E2ETest/testassets/generate/apps-with-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/dapr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/dockerfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions test/E2ETest/testassets/generate/frontend-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/generate-named-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/generate-uri-dependency.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/health-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions test/E2ETest/testassets/generate/multi-project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions test/E2ETest/testassets/generate/multirepo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/single-project-noregistry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/E2ETest/testassets/generate/single-project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down