Merge pull request #55 from esnet-security/topic/chriscummings/fix-ci…

…-ports fix: ci issues related to recent changes
esnet-security · Oct 28, 2024 · fec6c8c · fec6c8c
2 parents 7f99060 + 0400c99
commit fec6c8c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/.idea/runConfigurations/Django_Debugger.xml b/.idea/runConfigurations/Django_Debugger.xml
diff --git a/.idea/runConfigurations/Translator_Debugger.xml b/.idea/runConfigurations/Translator_Debugger.xml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "attach",
             "connect": {
                 "host": "0.0.0.0",
-                "port": 3000
+                "port": 56780
             },
             "pathMappings": [
                 {
@@ -25,7 +25,7 @@
             "request": "attach",
             "connect": {
                 "host": "0.0.0.0",
-                "port": 3001
+                "port": 56781
             },
             "pathMappings": [
                 {

diff --git a/compose.override.local.yml b/compose.override.local.yml
@@ -1,5 +1,4 @@
 ---
-version: "3.4"
 
 volumes:
   local_postgres_data: {}
@@ -21,17 +20,19 @@ services:
       test: ["CMD", "curl", "-f", "http://django:8000/process_expired/"]
     ports:
       - "8000"
-      - 3000:3000
+      - 56780:56780
     environment:
       # This can be set to either `debugpy` or `pycharm-pydevd` currently.
-      - DEBUG=${DEBUG}
+      - DEBUG=${DEBUG:-}
 
   postgres:
     volumes:
       - local_postgres_data:/var/lib/postgresql/data:Z
       - local_postgres_data_backups:/backups:z
     env_file:
       - ./.envs/.local/.postgres
+    deploy:
+      replicas: ${POSTGRES_ENABLED:-1}
 
   docs:
     image: scram_local_docs
@@ -65,10 +66,10 @@ services:
     volumes:
       - ./translator/tests/:/app/tests/
     ports:
-      - 3001:3001
+      - 56781:56781
     environment:
       # This can be set to either `debugpy` or `pycharm-pydevd` currently.
-      - DEBUG=${DEBUG}
+      - DEBUG=${DEBUG:-}
 
 networks:
   default:

diff --git a/compose.override.production.yml b/compose.override.production.yml
@@ -1,5 +1,4 @@
 ---
-version: '3.4'
 
 volumes:
   production_postgres_data: {}

diff --git a/compose.yml b/compose.yml
@@ -1,5 +1,4 @@
 ---
-version: '3.4'
 
 services:
   django:

diff --git a/config/asgi.py b/config/asgi.py
@@ -27,17 +27,17 @@
 
         import pydevd_pycharm
 
-        pydevd_pycharm.settrace("host.docker.internal", port=3003, stdoutToServer=True, stderrToServer=True)
+        pydevd_pycharm.settrace("host.docker.internal", port=56783, stdoutToServer=True, stderrToServer=True)
 
         logging.info("Debugger started.")
     elif debug_mode == "debugpy":
         logging.info("Entering debug mode for debugpy (VSCode)")
 
         import debugpy
 
-        debugpy.listen(("0.0.0.0", 3000))
+        debugpy.listen(("0.0.0.0", 56780))
 
-        logging.info("Debugger listening on port 3000.")
+        logging.info("Debugger listening on port 56780.")
     else:
         logging.warning(f"Invalid debug mode given: {debug_mode}. Debugger not started")
 

diff --git a/translator/translator.py b/translator/translator.py
@@ -36,7 +36,7 @@ def install_deps():
 
         import pydevd_pycharm
 
-        pydevd_pycharm.settrace("host.docker.internal", port=3002, stdoutToServer=True, stderrToServer=True)
+        pydevd_pycharm.settrace("host.docker.internal", port=56782, stdoutToServer=True, stderrToServer=True)
 
         logging.info("Debugger started.")
     elif debug_mode == "debugpy":
@@ -46,9 +46,9 @@ def install_deps():
 
         import debugpy
 
-        debugpy.listen(("0.0.0.0", 3001))
+        debugpy.listen(("0.0.0.0", 56781))
 
-        logging.info("Debugger listening on port 3001.")
+        logging.info("Debugger listening on port 56781.")
     else:
         logging.warning(f"Invalid debug mode given: {debug_mode}. Debugger not started")