From b70e3204bc3ffd789ba3aed9c6d8e8cd8cb92116 Mon Sep 17 00:00:00 2001
From: Marc <7050295+marcleblanc2@users.noreply.github.com>
Date: Thu, 29 Feb 2024 12:44:47 +0100
Subject: [PATCH] Fixing restart always (#21)

* Fixing restart always
---
 config/docker-compose-common-services.yaml | 1 +
 host-wsl/wsl2-startup.sh                   | 2 +-
 repo-converter/build/pull-build-start.sh   | 2 +-
 repo-converter/pull-start.sh               | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/docker-compose-common-services.yaml b/config/docker-compose-common-services.yaml
index 4797b3c..c39cb92 100644
--- a/config/docker-compose-common-services.yaml
+++ b/config/docker-compose-common-services.yaml
@@ -20,6 +20,7 @@ services:
     volumes:
       - ../src-serve-root/:/sourcegraph/src-serve-root:ro
     command: "serve-git -addr :443 /sourcegraph/src-serve-root"
+    restart: always
     networks:
       - default
 
diff --git a/host-wsl/wsl2-startup.sh b/host-wsl/wsl2-startup.sh
index a3be726..77da924 100644
--- a/host-wsl/wsl2-startup.sh
+++ b/host-wsl/wsl2-startup.sh
@@ -17,7 +17,7 @@ then
 fi
 
 # Start docker compose services
-if ! docker compose -f $repo_build_path/docker-compose.yaml up -d --build
+if ! docker compose -f $repo_build_path/docker-compose.yaml up -d --build --remove-orphans
 then
     docker_compose_exit_status=$?
     echo "docker compose up failed, exit code $docker_compose_exit_status" >> $log_file
diff --git a/repo-converter/build/pull-build-start.sh b/repo-converter/build/pull-build-start.sh
index 9fb23bb..d7eac4a 100644
--- a/repo-converter/build/pull-build-start.sh
+++ b/repo-converter/build/pull-build-start.sh
@@ -11,4 +11,4 @@ repo_converter_build_path="/sourcegraph/implementation-bridges/repo-converter/bu
 
 git -C $repo_converter_build_path pull
 
-docker compose -f $repo_converter_build_path/docker-compose.yaml up -d --build
+docker compose -f $repo_converter_build_path/docker-compose.yaml up -d --build --remove-orphans
diff --git a/repo-converter/pull-start.sh b/repo-converter/pull-start.sh
index 6b6c9d2..dd90014 100644
--- a/repo-converter/pull-start.sh
+++ b/repo-converter/pull-start.sh
@@ -14,6 +14,6 @@ repo_converter_dir="$sg_root_dir/implementation-bridges/repo-converter"
 date_time=$(date +"%F %T")
 echo "$date_time - Starting $0" >> "$log_file"
 
-command="git -C $repo_converter_dir pull && docker compose -f $repo_converter_dir/docker-compose.yaml up -d"
+command="git -C $repo_converter_dir pull && docker compose -f $repo_converter_dir/docker-compose.yaml up -d --remove-orphans"
 
 bash -c "$command" >> "$log_file" 2>&1