From f826c482caec51ff41b5f6aa262e3b7e7f8dc027 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 1 Nov 2021 14:11:28 +0530
Subject: [PATCH 01/11] fix git stash and filtron restart

---
 .gitignore     | 2 ++
 .gitlab-ci.yml | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1286ea66..055ca0dca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ dist/
 local/
 gh-pages/
 searx.egg-info/
+
+*.eggs
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 531414aed..8d0b900ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,10 +177,10 @@ deploy:spot.ecloud.global.backend1:
     MORTY_PORT: 8099
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 
-    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
+    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
     - docker-compose pull
+    - docker-compose stop filtron
     - docker-compose up -d
-    - docker-compose restart filtron
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
@@ -218,10 +218,10 @@ deploy:spot.ecloud.global.backend2:
     MORTY_PORT: 8099
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 
-    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
+    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
     - docker-compose pull
+    - docker-compose stop filtron
     - docker-compose up -d
-    - docker-compose restart filtron
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
-- 
GitLab


From 9042bf82a3d18b9e9ad4d95177a716c0df0802a8 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 1 Nov 2021 14:45:00 +0530
Subject: [PATCH 02/11] remove stash in staging deployments

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d0b900ca..8f1ee7032 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,7 +95,7 @@ deploy:spot.eeo.one.backend1:
     MORTY_PORT: 8089
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 
-    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
+    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
     - docker-compose up -d --build
     - docker-compose restart filtron
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot 
@@ -136,7 +136,7 @@ deploy:spot.eeo.one.backend2:
     MORTY_PORT: 8089
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 
-    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
+    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
     - docker-compose up -d --build
     - docker-compose restart filtron
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot 
-- 
GitLab


From cdda8d311540ee04325198071940046dc6c27fbb Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 2 Nov 2021 00:37:27 +0530
Subject: [PATCH 03/11] fix filtron restart in staging deployment

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f1ee7032..57a1e28f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,8 +96,8 @@ deploy:spot.eeo.one.backend1:
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
+    - docker-compose stop filtron
     - docker-compose up -d --build
-    - docker-compose restart filtron
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
@@ -137,8 +137,8 @@ deploy:spot.eeo.one.backend2:
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
+    - docker-compose stop filtron
     - docker-compose up -d --build
-    - docker-compose restart filtron
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
-- 
GitLab


From f2543b946fa00a16a793c9319bc5218acbd03a89 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 2 Nov 2021 01:11:05 +0530
Subject: [PATCH 04/11] run docker-compose after sed

---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57a1e28f7..0bb672fa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,8 +96,6 @@ deploy:spot.eeo.one.backend1:
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
-    - docker-compose stop filtron
-    - docker-compose up -d --build
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
@@ -111,6 +109,8 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
+    - docker-compose stop filtron
+    - docker-compose up -d --build
 
 deploy:spot.eeo.one.backend2:
   extends: .deploy:template
@@ -137,8 +137,6 @@ deploy:spot.eeo.one.backend2:
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
-    - docker-compose stop filtron
-    - docker-compose up -d --build
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
@@ -152,6 +150,8 @@ deploy:spot.eeo.one.backend2:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
+    - docker-compose stop filtron
+    - docker-compose up -d --build   
 
 
 deploy:spot.ecloud.global.backend1:
@@ -178,9 +178,6 @@ deploy:spot.ecloud.global.backend1:
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
-    - docker-compose pull
-    - docker-compose stop filtron
-    - docker-compose up -d
     - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
@@ -194,6 +191,9 @@ deploy:spot.ecloud.global.backend1:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
+    - docker-compose pull
+    - docker-compose stop filtron
+    - docker-compose up -d
 
 deploy:spot.ecloud.global.backend2:
   extends: .deploy:template
@@ -219,9 +219,6 @@ deploy:spot.ecloud.global.backend2:
   script:
     - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
-    - docker-compose pull
-    - docker-compose stop filtron
-    - docker-compose up -d
     - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot 
       && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 
       && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env 
@@ -235,4 +232,7 @@ deploy:spot.ecloud.global.backend2:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
+    - docker-compose pull
+    - docker-compose stop filtron
+    - docker-compose up -d
 
-- 
GitLab


From 800e1ba5a2e191239ab7b05f7cc549b5e9c21968 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 2 Nov 2021 01:29:46 +0530
Subject: [PATCH 05/11] add depends_on for filtron

---
 docker-compose.prod.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 45ffd4eb8..3954aca09 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -54,6 +54,8 @@ services:
     image: dalf/filtron:latest
     logging: *default-logging
     restart: always
+    depends_on: 
+      - spot-nginx
     command: -listen :3000 -rules /etc/filtron/rules.json -target spot-nginx
     networks:
       - ${INTERNAL_NETWORK_NAME}
-- 
GitLab


From 724b59d3954e081d8226fd9cbc003f1a034344be Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 2 Nov 2021 01:50:36 +0530
Subject: [PATCH 06/11] test filtron with changing entrypoint

---
 docker-compose.prod.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 3954aca09..41c3b060c 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -56,14 +56,15 @@ services:
     restart: always
     depends_on: 
       - spot-nginx
-    command: -listen :3000 -rules /etc/filtron/rules.json -target spot-nginx
+      - morty
     networks:
       - ${INTERNAL_NETWORK_NAME}
       - spot-wireguarded
     ports:
       - ${WIREGUARD_IP}:${FILTRON_PORT}:3000
     volumes:
-      - ./etc/filtron/rules.json:/etc/filtron/rules.json
+      - ./etc/filtron/rules.json:/etc/filtron/rules.json:rw
+    entrypoint: ["/usr/local/filtron/filtron", "--rules", "/etc/filtron/rules.json", "-listen", "3000", "-target", "spot-nginx"]
 
   morty:
     image: dalf/morty:latest
-- 
GitLab


From e2910949f72bc8747d7f41fea1d9b8cede42e1aa Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Tue, 2 Nov 2021 08:01:15 +0000
Subject: [PATCH 07/11] add sleep before d-c up

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bb672fa3..a9c05e60f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,6 +110,7 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
     - docker-compose stop filtron
+    - sleep 10
     - docker-compose up -d --build
 
 deploy:spot.eeo.one.backend2:
@@ -151,6 +152,7 @@ deploy:spot.eeo.one.backend2:
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
     - docker-compose stop filtron
+    - sleep 10
     - docker-compose up -d --build   
 
 
-- 
GitLab


From b77d2d6e546d00c2dc9a32d28089f34d454bf532 Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Tue, 2 Nov 2021 08:19:23 +0000
Subject: [PATCH 08/11] separate build and up -d

---
 .gitlab-ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9c05e60f..5c0d9b874 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,8 +110,10 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
     - docker-compose stop filtron
-    - sleep 10
-    - docker-compose up -d --build
+    - sleep 5
+    - docker-compose build
+    - sleep 5
+    - docker-compose up -d
 
 deploy:spot.eeo.one.backend2:
   extends: .deploy:template
@@ -152,8 +154,10 @@ deploy:spot.eeo.one.backend2:
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
     - docker-compose stop filtron
-    - sleep 10
-    - docker-compose up -d --build   
+    - sleep 5
+    - docker-compose build
+    - sleep 5
+    - docker-compose up -d
 
 
 deploy:spot.ecloud.global.backend1:
-- 
GitLab


From c93736a494409c78fc01ac8267cbc2586ec15b67 Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Tue, 2 Nov 2021 08:47:10 +0000
Subject: [PATCH 09/11] remove build and use pull

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c0d9b874..8b721a868 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,9 +109,9 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
-    - docker-compose stop filtron
+    - docker-compose pull
     - sleep 5
-    - docker-compose build
+    - docker-compose stop filtron
     - sleep 5
     - docker-compose up -d
 
@@ -153,9 +153,9 @@ deploy:spot.eeo.one.backend2:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
-    - docker-compose stop filtron
+    - docker-compose pull
     - sleep 5
-    - docker-compose build
+    - docker-compose stop filtron
     - sleep 5
     - docker-compose up -d
 
-- 
GitLab


From 7b4e076bc6bb513ef5d0dee8c21e17d7686b1f73 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 2 Nov 2021 23:18:27 +0530
Subject: [PATCH 10/11] run docker-compose from ssh

---
 .gitlab-ci.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b721a868..122b13f49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,12 +108,8 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
-      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
-    - docker-compose pull
-    - sleep 5
-    - docker-compose stop filtron
-    - sleep 5
-    - docker-compose up -d
+      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
+      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"
 
 deploy:spot.eeo.one.backend2:
   extends: .deploy:template
@@ -152,13 +148,8 @@ deploy:spot.eeo.one.backend2:
       && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
-      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
-    - docker-compose pull
-    - sleep 5
-    - docker-compose stop filtron
-    - sleep 5
-    - docker-compose up -d
-
+      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
+      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"
 
 deploy:spot.ecloud.global.backend1:
   extends: .deploy:template
-- 
GitLab


From 55b97a360f3809fe4eb90a516bbd0f9cfaf4f30e Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Tue, 2 Nov 2021 23:33:18 +0530
Subject: [PATCH 11/11] revert unnecessary changes

---
 .gitlab-ci.yml          | 14 +++++---------
 docker-compose.prod.yml |  7 ++-----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 122b13f49..4259dfde5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,7 +109,7 @@ deploy:spot.eeo.one.backend1:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
-      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"
+      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
 deploy:spot.eeo.one.backend2:
   extends: .deploy:template
@@ -187,10 +187,8 @@ deploy:spot.ecloud.global.backend1:
       && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
-      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
-    - docker-compose pull
-    - docker-compose stop filtron
-    - docker-compose up -d
+      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
+      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
 deploy:spot.ecloud.global.backend2:
   extends: .deploy:template
@@ -228,8 +226,6 @@ deploy:spot.ecloud.global.backend2:
       && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
-      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"
-    - docker-compose pull
-    - docker-compose stop filtron
-    - docker-compose up -d
+      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
+      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 41c3b060c..45ffd4eb8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -54,17 +54,14 @@ services:
     image: dalf/filtron:latest
     logging: *default-logging
     restart: always
-    depends_on: 
-      - spot-nginx
-      - morty
+    command: -listen :3000 -rules /etc/filtron/rules.json -target spot-nginx
     networks:
       - ${INTERNAL_NETWORK_NAME}
       - spot-wireguarded
     ports:
       - ${WIREGUARD_IP}:${FILTRON_PORT}:3000
     volumes:
-      - ./etc/filtron/rules.json:/etc/filtron/rules.json:rw
-    entrypoint: ["/usr/local/filtron/filtron", "--rules", "/etc/filtron/rules.json", "-listen", "3000", "-target", "spot-nginx"]
+      - ./etc/filtron/rules.json:/etc/filtron/rules.json
 
   morty:
     image: dalf/morty:latest
-- 
GitLab