minor updates for cartservice (GoogleCloudPlatform#481)

* ASPNETCORE_URLS in Dockerfile * GRPC_HEALTH_PROBE_VERSION=v0.3.6 * Grpc.AspNetCore - 2.34.0 * more for dockerignore * typo * remove unused files * c# 9 syntax improvement with Program.cs
jitu028 · Jan 11, 2021 · 7a2a0d7 · 7a2a0d7
1 parent 8f6c1f7
commit 7a2a0d7
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 144 deletions.
diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml
@@ -35,8 +35,6 @@ spec:
         env:
         - name: REDIS_ADDR
           value: "redis-cart:6379"
-        - name: ASPNETCORE_URLS
-          value: "http://0.0.0.0:7070"
         resources:
           requests:
             cpu: 200m

diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile
@@ -36,7 +36,7 @@ RUN mkdir -p /opt/cprof && \
     | tar xzv -C /opt/cprof && \
     rm -rf profiler_java_agent.tar.gz
 
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 

diff --git a/src/cartservice/.dockerignore b/src/cartservice/.dockerignore
@@ -1,3 +1,7 @@
 **/*.sh
 **/*.bat
 tests/
+**/bin/
+**/obj/
+**/out/
+Dockerfile*
diff --git a/src/cartservice/Dockerfile b/src/cartservice/Dockerfile
@@ -22,9 +22,10 @@ RUN dotnet publish cartservice.csproj -p:PublishSingleFile=true -r linux-musl-x6
 
 # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
 FROM mcr.microsoft.com/dotnet/runtime-deps:5.0.1-alpine3.12-amd64
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 WORKDIR /app
 COPY --from=builder /cartservice .
+ENV ASPNETCORE_URLS http://*:7070
 ENTRYPOINT ["/app/cartservice"]
diff --git a/src/cartservice/Program.cs b/src/cartservice/Program.cs
@@ -12,26 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using cartservice;
 
-namespace cartservice
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+CreateHostBuilder(args).Build().Run();
 
-        // Additional configuration is required to successfully run gRPC on macOS.
-        // For instructions on how to configure Kestrel and gRPC clients on macOS, visit https://go.microsoft.com/fwlink/?linkid=2099682
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}
+static IHostBuilder CreateHostBuilder(string[] args) =>
+    Host.CreateDefaultBuilder(args)
+        .ConfigureWebHostDefaults(webBuilder =>
+        {
+            webBuilder.UseStartup<Startup>();
+        });
diff --git a/src/cartservice/Startup.cs b/src/cartservice/Startup.cs
@@ -34,7 +34,7 @@ public void ConfigureServices(IServiceCollection services)
             else
             {
                 Console.WriteLine("Redis cache host(hostname+port) was not specified. Starting a cart service using local store");
-                Console.WriteLine("If you wanted to use Redis Cache as a backup store, you should provide its address via command line or REDIS_ADDRESS environment variable.");
+                Console.WriteLine("If you wanted to use Redis Cache as a backup store, you should provide its address via command line or REDIS_ADDR environment variable.");
                 cartStore = new LocalCartStore();
             }
 

diff --git a/src/cartservice/cartservice.csproj b/src/cartservice/cartservice.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.33.1" />
-    <PackageReference Include="Grpc.HealthCheck" Version="2.33.1" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.34.0" />
+    <PackageReference Include="Grpc.HealthCheck" Version="2.34.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
   </ItemGroup>
 

diff --git a/src/cartservice/scripts/build_image.bat b/src/cartservice/scripts/build_image.bat
diff --git a/src/cartservice/scripts/docker_setup.bat b/src/cartservice/scripts/docker_setup.bat
diff --git a/src/cartservice/scripts/run_redis_emulator_windows.bat b/src/cartservice/scripts/run_redis_emulator_windows.bat
diff --git a/src/cartservice/tests/cartservice.tests.csproj b/src/cartservice/tests/cartservice.tests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.33.1" />
-    <PackageReference Include="Grpc.Tools" Version="2.33.1" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.34.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.34.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

diff --git a/src/checkoutservice/Dockerfile b/src/checkoutservice/Dockerfile
@@ -25,7 +25,7 @@ RUN go build -gcflags='-N -l' -o /checkoutservice .
 
 FROM alpine as release
 RUN apk add --no-cache ca-certificates
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 COPY --from=builder /checkoutservice /checkoutservice

diff --git a/src/currencyservice/Dockerfile b/src/currencyservice/Dockerfile
@@ -31,7 +31,7 @@ RUN npm install --only=production
 
 FROM base
 
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 

diff --git a/src/emailservice/Dockerfile b/src/emailservice/Dockerfile
@@ -36,7 +36,7 @@ RUN apt-get -qq update \
         wget
 
 # Download the grpc health probe
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 

diff --git a/src/paymentservice/Dockerfile b/src/paymentservice/Dockerfile
@@ -31,7 +31,7 @@ RUN npm install --only=production
 
 FROM base
 
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 

diff --git a/src/productcatalogservice/Dockerfile b/src/productcatalogservice/Dockerfile
@@ -24,7 +24,7 @@ RUN go build -o /productcatalogservice .
 
 FROM alpine AS release
 RUN apk add --no-cache ca-certificates
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
 WORKDIR /productcatalogservice

diff --git a/src/recommendationservice/Dockerfile b/src/recommendationservice/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update -qqy && \
 ENV PYTHONUNBUFFERED=0
 
 # download the grpc health probe
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.5 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe