update dev environment

Author: jtdub

development/docker-compose.yaml

@@ -5,6 +5,14 @@ services:
     env_file: "creds.env"
   redis:
     image: "redis:latest"
+  proxy:
+    image: "haproxy:latest"
+    volumes:
+    - ./haproxy:/usr/local/etc/haproxy
+    ports:
+    - "80:80"
+    links:
+    - "app"
   worker:
     build:
       context: ../
@@ -19,13 +27,13 @@ services:
     - "db"
     - "redis"
     command: ["celery", "-A", "netopsio", "worker", "-l", "INFO"]
-  frontend:
+  app:
     build:
       context: ../
       dockerfile: ./development/Dockerfile
     env_file: "creds.env"
     ports:
-    - "80:8000"
+    - "8000:8000"
     volumes:
     - ../netopsio:/opt/netopsio
     depends_on:

development/haproxy/haproxy.cfg

@@ -0,0 +1,17 @@
+defaults
+    timeout connect 10s
+    timeout client 30s
+    timeout server 30s
+    log global
+    mode http
+    option httplog
+    maxconn 3000
+
+frontend http_server
+    bind 0.0.0.0:80
+    default_backend app_server
+
+backend app_server
+    balance roundrobin
+    option forwardfor
+    server app1 app:8000

tasks.py

@@ -93,7 +93,7 @@ def linting(context):
 
 
 @task
-def unittest(context, container="frontend"):
+def unittest(context, container="app"):
     """Execute Unit Tests."""
     command = "python manage.py test"
     docker_compose(context, f"exec {container} {command}", pty=True)
@@ -151,18 +151,18 @@ def destroy(context):
 
 
 @task(help={"container": "Name of the container to shell into"})
-def cli(context, container="frontend"):
+def cli(context, container="app"):
     """Launch a bash shell inside the running NetOps.io container."""
     docker_compose(context, f"exec {container} bash", pty=True)
 
 
 @task(
     help={
         "user": "Name of the superuser to create. (Default: admin)",
-        "container": "Name of the container to run the 'createsuperuser' command on. (Default: frontend)",
+        "container": "Name of the container to run the 'createsuperuser' command on. (Default: app)",
     }
 )
-def createsuperuser(context, user="admin", container="frontend"):
+def createsuperuser(context, user="admin", container="app"):
     """Create a new NetOps.io superuser account (default: "admin"), will prompt for password."""
     command = f"python manage.py createsuperuser --username {user}"
     docker_compose(context, f"exec {container} {command}", pty=True)
@@ -171,10 +171,10 @@ def createsuperuser(context, user="admin", container="frontend"):
 @task(
     help={
         "name": "Use this name for migration file(s). If unspecified, a name will be generated.",
-        "container": "Name of the container to run the 'makemigrations' command on. (Default: frontend)",
+        "container": "Name of the container to run the 'makemigrations' command on. (Default: app)",
     }
 )
-def makemigrations(context, name="", container="frontend"):
+def makemigrations(context, name="", container="app"):
     """Perform makemigrations operation in Django."""
     command = "python manage.py makemigrations"
 
@@ -185,10 +185,10 @@ def makemigrations(context, name="", container="frontend"):
 
 @task(
     help={
-        "container": "Name of the container to run the 'migrate' command on. (Default: frontend)"
+        "container": "Name of the container to run the 'migrate' command on. (Default: app)"
     }
 )
-def migrate(context, container="frontend"):
+def migrate(context, container="app"):
     """Perform migrate operation in Django."""
     command = "python manage.py migrate"
     docker_compose(context, f"exec {container} {command}", pty=True)