Fixing docker host default (#548)

* Prefer defaultHost * no null * fixing tests * port as well
dotnet · Jun 18, 2020 · 224101f · 224101f
1 parent 9cbf1fd
commit 224101f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/src/Microsoft.Tye.Hosting/Model/Application.cs b/src/Microsoft.Tye.Hosting/Model/Application.cs
@@ -148,13 +148,8 @@ private static void GetEffectiveBindings(bool isDockerRunInfo, string defaultHos
             foreach (var b in service.Description.Bindings)
             {
                 var protocol = b.Protocol;
-                var host = b.Host ?? (isDockerRunInfo ? service.Description.Name : defaultHost);
-
+                var host = b.Host ?? defaultHost ?? (isDockerRunInfo ? service.Description.Name : "");
                 var port = b.Port;
-                if (b.Port is object && isDockerRunInfo)
-                {
-                    port = b.ContainerPort ?? b.Port.Value;
-                }
 
                 bindings.Add(new EffectiveBinding(
                     service.Description.Name,

diff --git a/test/E2ETest/testassets/projects/health-checks/tye-liveness.yaml b/test/E2ETest/testassets/projects/health-checks/tye-liveness.yaml
@@ -5,8 +5,6 @@ services:
   - name: health-liveness
     project: api/api.csproj
     replicas: 3
-    bindings:
-      - port: 8002
     liveness:
       http:
         path: /healthy

diff --git a/test/E2ETest/testassets/projects/health-checks/tye-none.yaml b/test/E2ETest/testassets/projects/health-checks/tye-none.yaml
@@ -5,6 +5,4 @@ services:
   - name: health-none
     project: api/api.csproj
     replicas: 3
-    bindings:
-      - port: 8001
 
diff --git a/test/E2ETest/testassets/projects/health-checks/tye-proxy.yaml b/test/E2ETest/testassets/projects/health-checks/tye-proxy.yaml
@@ -5,8 +5,6 @@ services:
   - name: health-proxy
     project: api/api.csproj
     replicas: 2
-    bindings:
-      - port: 8005
     liveness:
       http:
         path: /healthy

diff --git a/test/E2ETest/testassets/projects/health-checks/tye-readiness.yaml b/test/E2ETest/testassets/projects/health-checks/tye-readiness.yaml
@@ -5,8 +5,6 @@ services:
   - name: health-readiness
     project: api/api.csproj
     replicas: 3
-    bindings:
-      - port: 8003
     readiness:
       http:
         path: /ready