Merge branch 'develop'

README.md

@@ -37,7 +37,7 @@ This builds and starts two containers, one for the API (named `helium_platform_a
 name, like:
 
 ```shell
-docker exec -it helium_platform_api /bin/bash
+docker exec -it platform-api-1 /bin/bash
 ```
 
 Inside the `platform` container, you can run Django commands against the app, like:

conf/configs/common.py

@@ -34,7 +34,6 @@
     PROJECT_APP_HOST = 'http://localhost:3000'
     PROJECT_API_HOST = 'http://localhost:8000'
 else:
-
     PROJECT_APP_HOST = config('PROJECT_APP_HOST', f'https://www.{ENVIRONMENT_PREFIX}heliumedu.com')
     PROJECT_API_HOST = config('PROJECT_API_HOST', f'https://api.{ENVIRONMENT_PREFIX}heliumedu.com')
 

conf/configs/deploy.py

@@ -64,6 +64,8 @@
         print(f"INFO: Added AWS private IP {private_ips} to ALLOWED_HOSTS")
     except Exception as e:
         print("INFO: No AWS IPs added to ALLOWED_HOSTS, ignore if not running on AWS")
+else:
+    ALLOWED_HOSTS = common.ALLOWED_HOSTS
 
 # Logging
 

docker-compose.yml

@@ -8,12 +8,10 @@ services:
       MYSQL_PASSWORD: "helium"
     ports:
       - 3306:3306
-    container_name: helium_db
   cache:
     image: redis:7.2
     ports:
       - 6379:6379
-    container_name: helium_cache
   storage:
     image: localstack/localstack:s3-latest
     environment:
@@ -22,15 +20,13 @@ services:
       - 4566:4566
     volumes:
       - "./container/init-localstack.py:/etc/localstack/init/ready.d/init-localstack.py"
-    container_name: helium_storage
   resource:
     image: helium/platform-resource
     env_file: .env
     volumes:
       - type: bind
         source: ./.env
         target: /app/.env
-    container_name: helium_platform_resource
     depends_on:
       - db
       - cache
@@ -44,7 +40,6 @@ services:
         target: /app/.env
     ports:
       - 8000:8000
-    container_name: helium_platform_api
     depends_on:
       - db
       - cache
@@ -58,7 +53,6 @@ services:
       - type: bind
         source: ./.env
         target: /app/.env
-    container_name: helium_platform_worker
     depends_on:
       - db
       - cache