start docker composing the backend, fix health response

Author: globalworming

.dockerignore

@@ -1,8 +1,4 @@
 # Ignore everything
-**
-
-# Allow files and folders with a pattern starting with !
-!todo-service
-!bff
-!single-page-application
-!grpc
+**/node_modules
+**/.gradle
+**/build

bff/src/main/java/com/headissue/compliance/Health.java

@@ -5,7 +5,6 @@
 import grpc.health.v1.HealthGrpc;
 import grpc.health.v1.Todo;
 import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -38,6 +37,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         toDoServiceHealth.add("serving", new JsonPrimitive(toDoServiceServing));
         servicesHealth.get("services").getAsJsonArray().add(bffServiceHealth);
         servicesHealth.get("services").getAsJsonArray().add(toDoServiceHealth);
-        response.getWriter().println(bffServiceHealth);
+        response.getWriter().println(servicesHealth);
     }
 }

docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3.9"
+services:
+  bff:
+    container_name: bff
+    build:
+      context: .
+      dockerfile: bff/Dockerfile
+    ports:
+      - "8080:8080"
+    environment:
+      TODO_SERVICE_HOST: localhost:8081
+  todo-service:
+    container_name: todo-service
+    build:
+      context: .
+      dockerfile: todo-service/Dockerfile
+    environment:
+      PORT: 8081

todo-service/.google/cloudbuild.yaml

@@ -9,11 +9,12 @@ substitutions:
 steps:
   - id: build
     name: gcr.io/cloud-builders/docker
-    dir: $_SERVICE_NAME
     args:
       - build
       - -t
       - $_IMAGE_NAME:dev
+      - -f
+      - $_SERVICE_NAME/Dockerfile
       - .
 
   - id: push

todo-service/Dockerfile

@@ -1,10 +1,8 @@
 FROM gradle:7.2.0-jdk17-alpine as gradle
-COPY --chown=gradle . /home/app
+COPY --chown=gradle todo-service /home/app
 WORKDIR /home/app
 RUN gradle assemble --no-daemon
 
-
-
 FROM openjdk:17-jdk-slim
 COPY --from=gradle /home/app/build/libs/*-all.jar app.jar
 EXPOSE 8080