feat: change for three worker

betarixm · Nov 27, 2023 · 8dd3d3c · 8dd3d3c
1 parent ae9ec83
commit 8dd3d3c
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 1,541 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,14 +5,30 @@ services:
       dockerfile: docker/master/Dockerfile
       args:
         - NUMBER_OF_WORKERS=2
-  worker:
+  worker1:
     build:
       context: .
-      dockerfile: docker/worker/Dockerfile
+      dockerfile: docker/worker1/Dockerfile
       args:
         - MASTER_HOST=master
         - MASTER_PORT=50051
-    deploy:
-      replicas: 2
     depends_on:
       - master
+  worker2:
+    build:
+      context: .
+      dockerfile: docker/worker2/Dockerfile
+      args:
+        - MASTER_HOST=master
+        - MASTER_PORT=50051
+    depends_on:
+      - master
+  worker3:
+    build:
+      context: .
+      dockerfile: docker/worker3/Dockerfile
+      args:
+        - MASTER_HOST=master
+        - MASTER_PORT=50051
+    depends_on:
+      - master
diff --git a/docker/worker/data/0/0 b/docker/worker/data/0/0
diff --git a/docker/worker/data/0/1 b/docker/worker/data/0/1
diff --git a/docker/worker/data/1/2 b/docker/worker/data/1/2
diff --git a/docker/worker/data/1/3 b/docker/worker/data/1/3
diff --git a/docker/worker/data/2/4 b/docker/worker/data/2/4
diff --git a/docker/worker/data/2/5 b/docker/worker/data/2/5
diff --git a/docker/worker/Dockerfile → docker/worker1/Dockerfile b/docker/worker/Dockerfile → docker/worker1/Dockerfile
@@ -32,4 +32,4 @@ COPY . .
 
 RUN sbt --batch compile
 
-ENTRYPOINT sbt --batch -v "worker/run ${MASTER_HOST}:${MASTER_PORT} -I /data/0 /data/1 /data/2 -O /output/"
+ENTRYPOINT sbt --batch -v "worker/run ${MASTER_HOST}:${MASTER_PORT} -I /data/input1 /data/input2 -O /output/"
diff --git a/docker/worker2/DockerFile b/docker/worker2/DockerFile
@@ -0,0 +1,35 @@
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-20.0.2_9_1.9.6_2.13.12
+
+ARG MASTER_HOST
+ARG MASTER_PORT
+
+ENV MASTER_HOST=${MASTER_HOST}
+ENV MASTER_PORT=${MASTER_PORT}
+
+ENV SBT_OPTS="-Xmx2G -Xss2M"
+
+RUN mkdir -p /app /data /output
+
+COPY docker/worker/data /data
+
+WORKDIR /app
+
+COPY build.sbt log4j2.properties ./
+COPY core/build.sbt ./core/
+COPY master/build.sbt ./master/
+COPY rpc/build.sbt ./rpc/
+COPY utils/build.sbt ./utils/
+COPY worker/build.sbt ./worker/
+COPY project/build.properties project/plugins.sbt project/scalapb.sbt ./project/
+
+RUN sbt --batch compile
+
+COPY rpc/src/main/protobuf  ./rpc/src/main/protobuf
+
+RUN sbt --batch compile
+
+COPY . .
+
+RUN sbt --batch compile
+
+ENTRYPOINT sbt --batch -v "worker/run ${MASTER_HOST}:${MASTER_PORT} -I /data/input1 /data/input2 -O /output/"
diff --git a/docker/worker3/DockerFile b/docker/worker3/DockerFile
@@ -0,0 +1,35 @@
+FROM sbtscala/scala-sbt:eclipse-temurin-jammy-20.0.2_9_1.9.6_2.13.12
+
+ARG MASTER_HOST
+ARG MASTER_PORT
+
+ENV MASTER_HOST=${MASTER_HOST}
+ENV MASTER_PORT=${MASTER_PORT}
+
+ENV SBT_OPTS="-Xmx2G -Xss2M"
+
+RUN mkdir -p /app /data /output
+
+COPY docker/worker/data /data
+
+WORKDIR /app
+
+COPY build.sbt log4j2.properties ./
+COPY core/build.sbt ./core/
+COPY master/build.sbt ./master/
+COPY rpc/build.sbt ./rpc/
+COPY utils/build.sbt ./utils/
+COPY worker/build.sbt ./worker/
+COPY project/build.properties project/plugins.sbt project/scalapb.sbt ./project/
+
+RUN sbt --batch compile
+
+COPY rpc/src/main/protobuf  ./rpc/src/main/protobuf
+
+RUN sbt --batch compile
+
+COPY . .
+
+RUN sbt --batch compile
+
+ENTRYPOINT sbt --batch -v "worker/run ${MASTER_HOST}:${MASTER_PORT} -I /data/input1 /data/input2 -O /output/"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ COPY . .

		RUN sbt --batch compile

		ENTRYPOINT sbt --batch -v "worker/run ${MASTER_HOST}:${MASTER_PORT} -I /data/0 /data/1 /data/2 -O /output/"
		ENTRYPOINT sbt --batch -v "worker/run ${MASTER_HOST}:${MASTER_PORT} -I /data/input1 /data/input2 -O /output/"