Merge branch 'main' into refactor/migrate-apollo-3-to-4t

Author: rudransh-shrivastava

.coderabbit.yaml

@@ -9,8 +9,10 @@ reviews:
   assess_linked_issues: true
   auto_apply_labels: false
   auto_review:
-    enabled: true
+    base_branches:
+      - feature/*
     drafts: true
+    enabled: true
   collapse_walkthrough: false
   high_level_summary: true
   high_level_summary_in_walkthrough: true

.dockerignore

@@ -4,6 +4,7 @@ __pycache__
 .cache
 .dockerignore
 .env
+.env.*
 .envs
 .git
 .gitignore

.github/ansible/production/proxy.yaml

@@ -1,29 +1,17 @@
   - name: Deploy Production Nest Proxy
     hosts: production_nest_proxy
     tasks:
-      - name: Copy proxy docker-compose.yaml
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/docker-compose.yaml'
-          dest: ~/docker-compose.yaml
-          mode: '0644'
-
-      - name: Copy proxy configuration file
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/production.conf'
-          dest: ~/production.conf
-          mode: '0644'
-
-      - name: Copy headers.conf
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/headers.conf'
-          dest: ~/headers.conf
-          mode: '0644'
-
-      - name: Copy redirects.conf
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/redirects.conf'
-          dest: ~/redirects.conf
+      - name: Copy proxy configuration files
+        copy:
+          src: '{{ github_workspace }}/proxy/{{ item }}'
+          dest: ~/
           mode: '0644'
+        loop:
+          - blocked_ips.conf
+          - docker-compose.yaml
+          - headers.conf
+          - production.conf
+          - redirects.conf
 
       - name: Retart services
         shell:

.github/ansible/staging/proxy.yaml

@@ -1,34 +1,22 @@
   - name: Deploy Staging Nest Proxy
     hosts: staging_nest_proxy
     tasks:
-      - name: Copy proxy docker-compose.yaml
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/docker-compose.yaml'
-          dest: ~/docker-compose.yaml
+      - name: Copy proxy configuration files
+        copy:
+          src: '{{ github_workspace }}/proxy/{{ item }}'
+          dest: ~/
           mode: '0644'
+        loop:
+          - blocked_ips.conf
+          - docker-compose.yaml
+          - headers.conf
+          - redirects.conf
+          - staging.conf
 
-      - name: Copy proxy configuration file
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/staging.conf'
-          dest: ~/staging.conf
-          mode: '0644'
-
-      - name: Copy headers.conf
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/headers.conf'
-          dest: ~/headers.conf
-          mode: '0644'
-
-      - name: Copy redirects.conf
-        ansible.builtin.copy:
-          src: '{{ github_workspace }}/proxy/redirects.conf'
-          dest: ~/redirects.conf
-          mode: '0644'
-
-      - name: Update Docker images
+      - name: Retart services
         shell:
-          cmd: docker compose pull
+          cmd: docker compose up -d --pull always
 
-      - name: Retart services
+      - name: Prune docker images
         shell:
-          cmd: docker compose restart
+          cmd: docker image prune -f