Reverting local changes

OpenConceptLab · Oct 11, 2024 · fdd9e1e · fdd9e1e
1 parent e67a640
commit fdd9e1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/core/settings.py b/core/settings.py
@@ -555,10 +555,10 @@
 DEFAULT_LOCALES_REPO_URI = os.environ.get('DEFAULT_LOCALES_REPO_URI', '/orgs/ISO/sources/iso639-1/')
 
 # keyCloak/OIDC Provider settings
-OIDC_SERVER_URL = os.environ.get('OIDC_SERVER_URL', 'http://localhost:8080')
+OIDC_SERVER_URL = os.environ.get('OIDC_SERVER_URL', '')
 OIDC_RP_CLIENT_ID = ''  # only needed a defined var in mozilla_django_oidc
 OIDC_RP_CLIENT_SECRET = ''  # only needed a defined var in mozilla_django_oidc
-OIDC_SERVER_INTERNAL_URL = os.environ.get('OIDC_SERVER_INTERNAL_URL', 'http://host.docker.internal:8080') or OIDC_SERVER_URL
+OIDC_SERVER_INTERNAL_URL = os.environ.get('OIDC_SERVER_INTERNAL_URL', '') or OIDC_SERVER_URL
 OIDC_REALM = os.environ.get('OIDC_REALM', 'ocl')
 OIDC_OP_AUTHORIZATION_ENDPOINT = f'{OIDC_SERVER_URL}/realms/{OIDC_REALM}/protocol/openid-connect/auth'
 OIDC_OP_REGISTRATION_ENDPOINT = f'{OIDC_SERVER_URL}/realms/{OIDC_REALM}/protocol/openid-connect/registrations'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     volumes:
       - redis-data:/bitnami/redis/data
   api:
-    build: .
+    image: openconceptlab/oclapi2:${ENVIRONMENT-production}
     restart: "always"
     ports:
       - 8000:8000
@@ -68,7 +68,7 @@ services:
     healthcheck:
       test: "curl --silent --fail http://localhost:3500/ || exit 1"
   celery:
-    build: .
+    image: openconceptlab/oclapi2:${ENVIRONMENT-production}
     command: ["bash", "-c", "CELERY_WORKER_NAME=default ./start_celery_worker.sh -P prefork -Q default -c 2"]
     restart: "always"
     healthcheck:
@@ -100,7 +100,7 @@ services:
       - ERRBIT_URL
       - ERRBIT_KEY
   celery_indexing:
-    build: .
+    image: openconceptlab/oclapi2:${ENVIRONMENT-production}
     command: ["bash", "-c", "CELERY_WORKER_NAME=indexing ./start_celery_worker.sh -P prefork -Q indexing -c 2"]
     restart: "always"
     healthcheck:
@@ -112,8 +112,8 @@ services:
       - ERRBIT_URL
       - ERRBIT_KEY
   celery_concurrent:
-    build: .
-    command: ["bash", "-c", "CELERY_WORKER_NAME=concurrent ./start_celery_worker.sh -P prefork -Q concurrent -c 4"]
+    image: openconceptlab/oclapi2:${ENVIRONMENT-production}
+    command: ["bash", "-c", "CELERY_WORKER_NAME=concurrent ./start_celery_worker.sh -P prefork -Q concurrent -c 2"]
     restart: "always"
     healthcheck:
       test:  ["CMD-SHELL", "-c", "CELERY_WORKER_NAME=concurrent ./ping_celery_worker.sh"]
@@ -154,7 +154,7 @@ services:
     volumes:
       - upload-data:/code/uploads
   celery_bulk_import_root:
-    build: .
+    image: openconceptlab/oclapi2:${ENVIRONMENT-production}
     command: ["bash", "-c", "CELERY_WORKER_NAME=bulk_import_root ./start_celery_worker.sh -Q bulk_import_root -c 1"]
     restart: "always"
     healthcheck: