Browse Source

Removing color from deployed app console logs (#577)

* Removing color from deployed app console logs

* Updating generated testassets for E2E test fixes wrt Type Serialization.

* Removing color for ApplyContainerDefaults with DockerFileServiceBuilder, fixing test files to include new env variables

* Removing color dependent code in DockerfileGenerator.cs for DockerFileServiceBuilder
pull/579/head
Matt Smith 6 years ago
committed by GitHub
parent
commit
c60541ba96
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/Microsoft.Tye.Core/DockerfileGenerator.cs
  2. 4
      test/E2ETest/testassets/generate/apps-with-ingress.yaml
  3. 2
      test/E2ETest/testassets/generate/dapr.yaml
  4. 2
      test/E2ETest/testassets/generate/dockerfile.yaml
  5. 4
      test/E2ETest/testassets/generate/frontend-backend.yaml
  6. 2
      test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml
  7. 2
      test/E2ETest/testassets/generate/generate-named-binding.yaml
  8. 2
      test/E2ETest/testassets/generate/generate-uri-dependency.yaml
  9. 2
      test/E2ETest/testassets/generate/health-checks.yaml
  10. 6
      test/E2ETest/testassets/generate/multi-project.yaml
  11. 4
      test/E2ETest/testassets/generate/multirepo.yaml
  12. 2
      test/E2ETest/testassets/generate/single-project-noregistry.yaml
  13. 2
      test/E2ETest/testassets/generate/single-project.yaml

3
src/Microsoft.Tye.Core/DockerfileGenerator.cs

@ -124,6 +124,9 @@ namespace Microsoft.Tye
}
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)

4
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

2
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

2
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

4
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

2
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

2
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

2
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

2
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

6
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

4
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

2
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

2
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

Loading…
Cancel
Save