chore

Author: michael-yin

.coveragerc

@@ -0,0 +1,7 @@
+[run]
+omit =
+    tests/*
+    */migrations/*
+    manage.py
+    tests.py
+    factories.py

compose/auto_deploy_do.sh

@@ -0,0 +1,26 @@
+#! /bin/bash
+
+# This shell script quickly deploys your project to your
+# DigitalOcean Droplet
+
+if [ -z "$DIGITAL_OCEAN_IP_ADDRESS" ]
+then
+    echo "DIGITAL_OCEAN_IP_ADDRESS not defined"
+    exit 0
+fi
+
+# generate TAR file from git
+git archive --format tar --output ./project.tar master
+
+echo 'Uploading project...'
+rsync ./project.tar root@$DIGITAL_OCEAN_IP_ADDRESS:/tmp/project.tar
+echo 'Uploaded complete.'
+
+echo 'Building image...'
+ssh -o StrictHostKeyChecking=no root@$DIGITAL_OCEAN_IP_ADDRESS << 'ENDSSH'
+    mkdir -p /app
+    rm -rf /app/* && tar -xf /tmp/project.tar -C /app
+    docker compose -f /app/docker-compose.prod.yml build
+    supervisorctl restart docker-app
+ENDSSH
+echo 'Build complete.'

compose/local/django/celery/worker/start

@@ -5,4 +5,4 @@ set -o nounset
 
 watchfiles \
   --filter python \
-  'celery -A django_celery_example worker --loglevel=info -Q high_priority,default'      # update
+  'celery -A django_celery_example worker --loglevel=info -Q high_priority,default'

django_celery_example/celery.py

@@ -30,8 +30,8 @@ def divide(x, y):
     # rdb.set_trace()
 
     # this is for test purposes
-    # import time
-    # time.sleep(10)
+    import time
+    time.sleep(10)
     return x / y
 
 

django_celery_example/urls.py

@@ -20,7 +20,7 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('member/', include('tdd.urls')),          # new
+    path('member/', include('tdd.urls')),
     path('', include('polls.urls')),
 ]
 

docker-compose.prod.yml

@@ -92,26 +92,26 @@ services:
       - redis
       - db
 
-  # prometheus:
-  #   image: prom/prometheus
-  #   ports:
-  #     - 9090:9090
-  #   command:
-  #     - --config.file=/etc/prometheus/prometheus.yml
-  #   volumes:
-  #     - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
-  #   depends_on:
-  #     - cadvisor
+  prometheus:
+    image: prom/prometheus
+    ports:
+      - 9090:9090
+    command:
+      - --config.file=/etc/prometheus/prometheus.yml
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+    depends_on:
+      - cadvisor
 
-  # cadvisor:
-  #   image: gcr.io/cadvisor/cadvisor
-  #   container_name: cadvisor
-  #   volumes:
-  #     - /:/rootfs:ro
-  #     - /var/run:/var/run:rw
-  #     - /sys:/sys:ro
-  #     - /var/lib/docker/:/var/lib/docker:ro
-  #     - /var/run/docker.sock:/var/run/docker.sock:ro
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor
+    container_name: cadvisor
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
 
 volumes:
   postgres_data: