Updated lobbies (#68)

deesejohn · Jul 10, 2021 · 5e3fc95 · 5e3fc95
1 parent 408f9f7
commit 5e3fc95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/services/lobbies-spa/skaffold.yaml b/services/lobbies-spa/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta16
+apiVersion: skaffold/v2beta18
 kind: Config
 metadata:
   name: lobbies-spa

diff --git a/services/lobbies/Dockerfile b/services/lobbies/Dockerfile
@@ -1,5 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS base
-RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /app
 COPY *.sln .
 COPY src/*/*.csproj ./
@@ -10,16 +9,8 @@ COPY tests/*/*.csproj ./
 RUN for file in $(ls *.csproj); \
     do mkdir -p tests/${file%.*}/ && mv $file tests/${file%.*}/; \
     done
-RUN dotnet restore
-
-FROM base AS test
-WORKDIR /app
 COPY . .
-RUN dotnet test -c "Test" --collect:"XPlat Code Coverage"
-
-FROM test AS build
-WORKDIR /app
-RUN dotnet publish -c release -o out --no-restore
+RUN dotnet publish -c release -o out
 
 FROM mcr.microsoft.com/dotnet/aspnet:5.0
 WORKDIR /app

diff --git a/services/lobbies/src/api/Controllers/LobbiesController.cs b/services/lobbies/src/api/Controllers/LobbiesController.cs
@@ -23,9 +23,9 @@ public LobbiesController(LobbyService lobbyService, PlayerServiceClient playerSe
         }
 
         [HttpGet("/{lobbyId}")]
-        public Task<Lobby> GetAsync(string lobbyId)
+        public Task<Lobby> GetAsync(string lobbyId, CancellationToken cancellationToken)
         {
-            return _lobbyService.GetAsync(lobbyId);
+            return _lobbyService.GetAsync(lobbyId, cancellationToken);
         }
 
         [HttpPost]