From 9abb1fce643a6d7c75b4a293dc602e4e0d44bf3b Mon Sep 17 00:00:00 2001
From: Israel Yago Pereira <israelyago@e.email>
Date: Fri, 5 Nov 2021 16:27:47 -0300
Subject: [PATCH 01/12] WIP: Update bing cookie value

---
 searx/engines/bing_images.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index 4bee9bc7d..251ce5b09 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -6,6 +6,7 @@
 from urllib.parse import urlencode
 from lxml import html
 from json import loads
+from random import randrange
 from searx.utils import match_language
 
 from searx.engines.bing import language_aliases
@@ -59,8 +60,12 @@ def request(query, params):
 
     language = match_language(params['language'], supported_languages, language_aliases).lower()
 
+    HV = randrange(1e10, 1e11)
+    WTS = randrange(1e11, 1e12)
+
     params['cookies']['SRCHHPGUSR'] = \
-        'ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')
+        f'SRCHLANG=en&BRW=XW&BRH=M&CW=1848&CH=984&DPR=1&UTC=-180&DM=1&HV={HV}&WTS={WTS}&ADLT=' \
+        + safesearch_types.get(params['safesearch'], 'DEMOTE')
 
     params['cookies']['_EDGE_S'] = 'mkt=' + language +\
         '&ui=' + language + '&F=1'
-- 
GitLab


From 2ee466326fd455b7d9c1ac2fb7c9ca196bdd5072 Mon Sep 17 00:00:00 2001
From: Israel Yago Pereira <israelyago@e.email>
Date: Tue, 9 Nov 2021 08:57:43 -0300
Subject: [PATCH 02/12] Testing safesearch always OFF

---
 searx/engines/bing_images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index 251ce5b09..6af5a87b8 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -65,7 +65,7 @@ def request(query, params):
 
     params['cookies']['SRCHHPGUSR'] = \
         f'SRCHLANG=en&BRW=XW&BRH=M&CW=1848&CH=984&DPR=1&UTC=-180&DM=1&HV={HV}&WTS={WTS}&ADLT=' \
-        + safesearch_types.get(params['safesearch'], 'DEMOTE')
+        + 'OFF'
 
     params['cookies']['_EDGE_S'] = 'mkt=' + language +\
         '&ui=' + language + '&F=1'
-- 
GitLab


From 189dcebb6411002f85e1b3debff169c741fd94a5 Mon Sep 17 00:00:00 2001
From: Israel Yago Pereira <israelyago@e.email>
Date: Tue, 9 Nov 2021 08:58:01 -0300
Subject: [PATCH 03/12] Test number on UI

---
 searx/templates/etheme/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/searx/templates/etheme/base.html b/searx/templates/etheme/base.html
index c3599fd2d..0461ecb49 100644
--- a/searx/templates/etheme/base.html
+++ b/searx/templates/etheme/base.html
@@ -88,6 +88,7 @@
     <footer>
         {% block footer %}
         {% endblock %}
+        Test <b>1</b><br />
         <p class="text-muted">
             <small>
                 e Foundation 2018-2021,
-- 
GitLab


From 2321a0613d44f0cb6fe5d09ffc6b014054ad13c0 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 00:21:14 +0530
Subject: [PATCH 04/12] git switch branch in staging

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1baa18f2..d4830fb79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,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 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"
+    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && 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 
       && 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 
@@ -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 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"
+    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && 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 
       && 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 35f65b35680870b0717c809a49d2c0c13e2f750b Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 00:59:58 +0530
Subject: [PATCH 05/12] attempt to clean install the repo

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4830fb79..7f38935c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,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 reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && 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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && 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 
       && 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 
@@ -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 reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && 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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && 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 
       && 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 59eca026c557fd63d1dbdec5f6b904dc019f62d1 Mon Sep 17 00:00:00 2001
From: Israel Yago Pereira <israelyago@e.email>
Date: Tue, 9 Nov 2021 16:32:12 -0300
Subject: [PATCH 06/12] Possible fix for bing images sometimes filtering

---
 searx/engines/bing_images.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index 6af5a87b8..adf17637d 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -58,17 +58,30 @@ def request(query, params):
         count=number_of_results,
         first=offset)
 
-    language = match_language(params['language'], supported_languages, language_aliases).lower()
+    language = match_language(params['language'], supported_languages, language_aliases, 'en').lower()
 
     HV = randrange(1e10, 1e11)
     WTS = randrange(1e11, 1e12)
+    CW = randrange(1e4, 1e5)
+    CH = randrange(1e3, 1e5)
 
     params['cookies']['SRCHHPGUSR'] = \
-        f'SRCHLANG=en&BRW=XW&BRH=M&CW=1848&CH=984&DPR=1&UTC=-180&DM=1&HV={HV}&WTS={WTS}&ADLT=' \
-        + 'OFF'
+        f'SRCHLANG={language}&BRW=XW&BRH=M&CW={CW}&CH={CH}&DPR=1&UTC=-180&DM=1&HV={HV}&WTS={WTS}&ADLT=' \
+        + safesearch_types.get(params['safesearch'], 'DEMOTE')
 
     params['cookies']['_EDGE_S'] = 'mkt=' + language +\
         '&ui=' + language + '&F=1'
+    
+    params['cookies']['_IDET'] = 'MIExp=0'
+    params['cookies']['MMCA'] = 'ID=B361EE82CAB9425EB0EE47B5E80DF8C1'
+    params['cookies']['BCP'] = 'AD=1&AL=1&SM=1'
+    params['cookies']['_SS'] = 'SID=3208F62E63AF6F2F047CE6C462866EF2&R=0&RB=0&GB=0&RG=0&RP=0'
+    params['cookies']['SRCHUID'] = 'V=2&GUID=EC79C7475528483B98FBE3F045357F18&dmnchg=1'
+    params['cookies']['MUID'] = '11635A5F5EAA6FD83B3F4AB55F836EFF'
+    params['cookies']['SRCHD'] = 'AF=IRPRST'
+    params['cookies']['MUIDB'] = '11635A5F5EAA6FD83B3F4AB55F836EFF'
+    params['cookies']['_EDGE_V'] = '1'
+    params['cookies']['SUID'] = 'M'
 
     params['url'] = base_url + search_path
     if params['time_range'] in time_range_dict:
-- 
GitLab


From 3b782c1ae0390a9765b35dda37960d69131d0ecd Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 01:14:40 +0530
Subject: [PATCH 07/12] fix git clone

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f38935c0..9d0e3795a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && 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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && 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 
       && 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 
@@ -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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && 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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && 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 
       && 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 f185eb6a113c88f4a61bdebc8490aaf63e9706c0 Mon Sep 17 00:00:00 2001
From: Israel Yago Pereira <israelyago@e.email>
Date: Tue, 9 Nov 2021 16:46:48 -0300
Subject: [PATCH 08/12] Fix blank line for pep8

---
 searx/engines/bing_images.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index adf17637d..6f96fb5f0 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -71,7 +71,6 @@ def request(query, params):
 
     params['cookies']['_EDGE_S'] = 'mkt=' + language +\
         '&ui=' + language + '&F=1'
-    
     params['cookies']['_IDET'] = 'MIExp=0'
     params['cookies']['MMCA'] = 'ID=B361EE82CAB9425EB0EE47B5E80DF8C1'
     params['cookies']['BCP'] = 'AD=1&AL=1&SM=1'
-- 
GitLab


From 2027876bda82c1f859cf24fa4c26d861ef5330b6 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Wed, 10 Nov 2021 12:01:03 +0530
Subject: [PATCH 09/12] run dokcer build only for master

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d0e3795a..d7e68426e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,8 @@ build:web:
   script:
     - ./manage themes.etheme
     - ./manage babel.compile
+  only:
+    - master  
 
 .build:docker:
   stage: build
-- 
GitLab


From 969120b034a6ec9a06e1bfdd31ae7b4cde070f0c Mon Sep 17 00:00:00 2001
From: Israel Yago Pereira <israelyago@e.email>
Date: Wed, 10 Nov 2021 16:00:36 -0300
Subject: [PATCH 10/12] Testing always strict filter

---
 searx/engines/bing_images.py     | 2 +-
 searx/templates/etheme/base.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index 6f96fb5f0..afc3d2633 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -67,7 +67,7 @@ def request(query, params):
 
     params['cookies']['SRCHHPGUSR'] = \
         f'SRCHLANG={language}&BRW=XW&BRH=M&CW={CW}&CH={CH}&DPR=1&UTC=-180&DM=1&HV={HV}&WTS={WTS}&ADLT=' \
-        + safesearch_types.get(params['safesearch'], 'DEMOTE')
+        + 'STRICT'
 
     params['cookies']['_EDGE_S'] = 'mkt=' + language +\
         '&ui=' + language + '&F=1'
diff --git a/searx/templates/etheme/base.html b/searx/templates/etheme/base.html
index 0461ecb49..5fc34bf6e 100644
--- a/searx/templates/etheme/base.html
+++ b/searx/templates/etheme/base.html
@@ -88,7 +88,7 @@
     <footer>
         {% block footer %}
         {% endblock %}
-        Test <b>1</b><br />
+        Test <b>2</b><br />
         <p class="text-muted">
             <small>
                 e Foundation 2018-2021,
-- 
GitLab


From fbe0d31ca0cd8d2da300ecca503fe509b4bc478d Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 09:47:59 +0530
Subject: [PATCH 11/12] push to registry for all branches

---
 .gitlab-ci.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7e68426e..0c512d2b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,6 @@ build:web:
   script:
     - ./manage themes.etheme
     - ./manage babel.compile
-  only:
-    - master  
 
 .build:docker:
   stage: build
@@ -39,10 +37,8 @@ build:web:
     - docker build -t $CI_REGISTRY_IMAGE/nginx -f nginx.Dockerfile .
     - docker push $CI_REGISTRY_IMAGE/nginx
 
-build:docker:master:
+build:docker:
   extends: .build:docker
-  only:
-    - master
 
 build:docker:tags:
   extends: .build:docker
@@ -98,7 +94,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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && 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"
     - 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 
@@ -112,7 +108,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 2 && docker-compose up -d --build"
+      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
 deploy:spot.eeo.one.backend2:
   extends: .deploy:template
@@ -138,7 +134,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/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && 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"
     - 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,7 +148,7 @@ 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 pull && docker-compose stop filtron && sleep 5 && docker-compose up -d --build"
+      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"
 
 deploy:spot.ecloud.global.backend1:
   extends: .deploy:template
-- 
GitLab


From 749e78c52fa99d33a0b16c86dd072324439ba989 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Thu, 11 Nov 2021 09:57:09 +0530
Subject: [PATCH 12/12] add  in build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c512d2b8..7b5fe3a8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,10 +32,10 @@ build:web:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   script:
-    - docker build -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
-    - docker build -t $CI_REGISTRY_IMAGE/nginx -f nginx.Dockerfile .
-    - docker push $CI_REGISTRY_IMAGE/nginx
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    - docker build -t $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG -f nginx.Dockerfile .
+    - docker push $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG
 
 build:docker:
   extends: .build:docker
-- 
GitLab