From 583e4659ad5e047adef3f7cfb10e8e03e0b8bf11 Mon Sep 17 00:00:00 2001
From: Sergey Stepanov <sergystepanov@gmail.com>
Date: Mon, 3 Apr 2023 00:13:37 +0300
Subject: [PATCH] Update deployment

---
 .github/workflows/cd/cloudretro.io/script.env | 2 +-
 .github/workflows/cd/deploy-app.sh            | 6 +++---
 .github/workflows/cd/docker-compose.yml       | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cd/cloudretro.io/script.env b/.github/workflows/cd/cloudretro.io/script.env
index f6e6e27f..ceebbbb6 100644
--- a/.github/workflows/cd/cloudretro.io/script.env
+++ b/.github/workflows/cd/cloudretro.io/script.env
@@ -3,4 +3,4 @@ DOCKER_IMAGE_TAG=dev
 #DO_ADDRESS_LIST="cloud-gaming cloud-gaming-eu cloud-gaming-usw"
 #SPLIT_HOSTS=1
 USER=root
-WORKERS=${WORKERS:-5}
+WORKERS=${WORKERS:-4}
diff --git a/.github/workflows/cd/deploy-app.sh b/.github/workflows/cd/deploy-app.sh
index 7fb80312..e8b027b0 100755
--- a/.github/workflows/cd/deploy-app.sh
+++ b/.github/workflows/cd/deploy-app.sh
@@ -68,7 +68,7 @@ REMOTE_WORK_DIR=${REMOTE_WORK_DIR:-"/cloud-game"}
 DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG:-latest}
 echo "Docker tag:$DOCKER_IMAGE_TAG"
 # the total number of worker replicas to deploy
-WORKERS=${WORKERS:-5}
+WORKERS=${WORKERS:-4}
 USER=${USER:-root}
 
 compose_src=$(cat $LOCAL_WORK_DIR/docker-compose.yml)
@@ -146,7 +146,7 @@ for ip in $IP_LIST; do
   fi
 
   # build run command
-  cmd="ZONE=\$zone docker compose up -d --remove-orphans --scale worker=\${workers:-$WORKERS}"
+  cmd="ZONE=\$zone docker compose up -d --remove-orphans"
   if [ ! -z "$SPLIT_HOSTS" ]; then
     cmd+=" worker"
     deploy_coordinator=0
@@ -198,7 +198,7 @@ for ip in $IP_LIST; do
   run="#!/bin/bash"$'\n'
   run+=$(remote_run_commands "$ENV_DIR")$'\n'
   run+=$(remote_run_commands "$PROVIDER_DIR")$'\n'
-  run+="IMAGE_TAG=$DOCKER_IMAGE_TAG APP_DIR=$REMOTE_WORK_DIR $cmd"
+  run+="IMAGE_TAG=$DOCKER_IMAGE_TAG APP_DIR=$REMOTE_WORK_DIR WORKER_REPLICAS=$WORKERS $cmd"
 
   echo ""
   echo "run.sh:"$'\n'"$run"
diff --git a/.github/workflows/cd/docker-compose.yml b/.github/workflows/cd/docker-compose.yml
index 0074b8aa..1943eec8 100644
--- a/.github/workflows/cd/docker-compose.yml
+++ b/.github/workflows/cd/docker-compose.yml
@@ -25,6 +25,11 @@ services:
 
   worker:
     <<: *default-params
+    depends_on:
+      - coordinator
+    deploy:
+      mode: replicated
+      replicas: ${WORKER_REPLICAS:-4}
     environment:
       - MESA_GL_VERSION_OVERRIDE=3.3
     #entrypoint: [ "/bin/sh", "-c", "xvfb-run -a $$@", "" ]