Fix bridging and refactor

docker-compose.yml

@@ -71,63 +71,14 @@ services:
     volumes:
       - "./signal-cli-config:/home/.local/share/signal-cli"
 
-  processing:
+  ur:
     image: xf/gia:prod
-    container_name: processing_gia
+    container_name: ur_gia
     build:
       context: .
       args:
         OPERATION: ${OPERATION}
-    command: sh -c '. /venv/bin/activate && python manage.py processing'
-    volumes:
-      - ${REPO_DIR}:/code
-      - ${REPO_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini
-      - ${APP_DATABASE_FILE}:/conf/db.sqlite3
-      - type: bind
-        source: /code/vrun
-        target: /var/run
-    environment: 
-      APP_PORT: "${APP_PORT}"
-      REPO_DIR: "${REPO_DIR}"
-      APP_LOCAL_SETTINGS: "${APP_LOCAL_SETTINGS}"
-      APP_DATABASE_FILE: "${APP_DATABASE_FILE}"
-      DOMAIN: "${DOMAIN}"
-      URL: "${URL}"
-      ALLOWED_HOSTS: "${ALLOWED_HOSTS}"
-      NOTIFY_TOPIC: "${NOTIFY_TOPIC}"
-      CSRF_TRUSTED_ORIGINS: "${CSRF_TRUSTED_ORIGINS}"
-      DEBUG: "${DEBUG}"
-      SECRET_KEY: "${SECRET_KEY}"
-      STATIC_ROOT: "${STATIC_ROOT}"
-      REGISTRATION_OPEN: "${REGISTRATION_OPEN}"
-      OPERATION: "${OPERATION}"
-      SIGNAL_NUMBER: "${SIGNAL_NUMBER}"
-      XMPP_ADDRESS: "${XMPP_ADDRESS}"
-      XMPP_JID: "${XMPP_JID}"
-      XMPP_PORT: "${XMPP_PORT}"
-      XMPP_SECRET: "${XMPP_SECRET}"
-    depends_on:
-      redis:
-        condition: service_healthy
-      migration:
-        condition: service_started
-      collectstatic:
-        condition: service_started
-    # deploy:
-    #   resources:
-    #     limits:
-    #       cpus: '0.25'
-    #       memory: 0.25G
-    #network_mode: host
-
-  component:
-    image: xf/gia:prod
-    container_name: component_gia
-    build:
-      context: .
-      args:
-        OPERATION: ${OPERATION}
-    command: sh -c '. /venv/bin/activate && python manage.py component'
+    command: sh -c '. /venv/bin/activate && python manage.py ur'
     volumes:
       - ${REPO_DIR}:/code
       - ${REPO_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini