From 3b8a0c5e60f4ce8609caa02310364ab86f971691 2024-02-23 08:22:04
From: RhodeCode Admin <admin@rhodecode.com>
Date: 2024-02-23 08:22:04
Subject: [PATCH] feat(dev-env): fast start celery/ssh on dev env, but replace them with code-based instances if they are started

---

diff --git a/scripts/dev-tools/dev-tools b/scripts/dev-tools/dev-tools
index 0e99449..16e429e 100755
--- a/scripts/dev-tools/dev-tools
+++ b/scripts/dev-tools/dev-tools
@@ -1112,7 +1112,7 @@ dev_tools_celery_command() {
 
   docker_exec_script="/var/opt/rhodecode_repo_store/$cmd_script"
 
-  docker_id=$(docker ps -q --filter "name=$container_name")
+  docker_id=$(docker ps -q --filter "name=$container_name" --filter name="rc_cluster_apps-celery")
 
   if [[ $docker_id ]]; then
     echo $container_name FOUND, Killing old one !
@@ -1173,7 +1173,7 @@ dev_tools_celeryd_command() {
 
   docker_exec_script="/var/opt/rhodecode_repo_store/$cmd_script"
 
-  docker_id=$(docker ps -q --filter "name=$container_name")
+  docker_id=$(docker ps -q --filter "name=$container_name" --filter name="rc_cluster_apps-celery")
 
   if [[ $docker_id ]]; then
     echo $container_name FOUND, Killing old one !
@@ -1237,7 +1237,7 @@ dev_tools_ssh_command() {
 
   docker_exec_script="/var/opt/rhodecode_repo_store/$cmd_script"
 
-  docker_id=$(docker ps -q --filter "name=$container_name")
+  docker_id=$(docker ps -q --filter "name=$container_name" --filter name="rc_cluster_apps-sshd")
 
   if [[ $docker_id ]]; then
     echo $container_name FOUND, Killing old one !
@@ -1301,7 +1301,7 @@ dev_tools_sshd_command() {
 
   docker_exec_script="/var/opt/rhodecode_repo_store/$cmd_script"
 
-  docker_id=$(docker ps -q --filter "name=$container_name")
+  docker_id=$(docker ps -q --filter "name=$container_name" --filter name="rc_cluster_apps-sshd")
 
   if [[ $docker_id ]]; then
     echo $container_name FOUND, Killing old one !
@@ -1365,8 +1365,8 @@ dev_tools_dev_env_command() {
   ./rcstack stack services up --detach httpbin && \
   ./rcstack stack services up --detach ldap-server && \
   ./rcstack stack rhodecode up --detach svn && \
-  ./dev-tools celeryd && \
-  ./dev-tools sshd && \
+  ./rcstack stack rhodecode up --detach celery celery-beat && \
+  ./rcstack stack rhodecode up --detach sshd && \
   ./rcstack status"
 }