Heroku ready (#276)

* Get heroku ready * Add yml file * Remove unneeded files * Remove deploy files * Remove check for services being ready * Update logs * Update logging * Updating tc root * Logging for photos * Logging for setting an image * More logging * Images to aws * Remove hash test * Storing images in s3 and tests * Adding secrets * Tests * Add runtime * Fix deploy * Install boto3 * Fix images * Remove end2end
tutorcruncher · Jun 22, 2020 · 2bda0b6 · 2bda0b6
1 parent 705a57d
commit 2bda0b6
Show file tree

Hide file tree

Showing 43 changed files with 154 additions and 607 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,6 +48,9 @@ jobs:
 
     - name: test
       run: make test
+      env:
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
 
     - name: codecov
       run: bash <(curl -s https://codecov.io/bash)

diff --git a/.pyup.yml b/.pyup.yml
diff --git a/Makefile b/Makefile
@@ -24,9 +24,10 @@ lint:
 test:
 	pytest --cov=tcsocket
 
-.PHONY: testcov
-testcov: test
-	coverage html
+.PHONY: build
+build:
+	docker build tcsocket/ -t tcsocket
 
-.PHONY: all
-all: testcov lint
+.PHONY: prod-push
+prod-push:
+	git push heroku `git rev-parse --abbrev-ref HEAD`:master
diff --git a/activate.dev.sh b/activate.dev.sh
diff --git a/client.py b/client.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3.6
 import asyncio
 import json
 import os
@@ -109,10 +108,7 @@ async def company_options(*, public_key, **kwargs):
     'last_name': 'Howell',
     'town': 'Edinburgh',
     'country': 'United Kingdom',
-    'location': {
-        'latitude': None,
-        'longitude': None
-    },
+    'location': {'latitude': None, 'longitude': None},
     'photo': 'http://unsplash.com/photos/vltMzn0jqsA/download',
     'extra_attributes': [
         {
@@ -121,55 +117,30 @@ async def company_options(*, public_key, **kwargs):
             'type': 'text_extended',
             'sort_index': 0,
             'value': 'The returned group is itself an iterator that shares the underlying iterable with groupby(). '
-                     'Because the source is shared, when the groupby() object is advanced, the previous group is no '
-                     'longer visible. So, if that data is needed later, it should be stored as a list:',
-            'id': 195
+            'Because the source is shared, when the groupby() object is advanced, the previous group is no '
+            'longer visible. So, if that data is needed later, it should be stored as a list:',
+            'id': 195,
         },
         {
             'machine_name': None,
             'name': 'Teaching Experience',
             'type': 'text_short',
             'sort_index': 0,
             'value': 'Harvard',
-            'id': 196
+            'id': 196,
         },
     ],
     'skills': [
-        {
-            'qual_level': 'A Level',
-            'subject': 'Mathematics',
-            'qual_level_ranking': 18.0,
-            'category': 'Maths'
-        },
-        {
-            'qual_level': 'GCSE',
-            'subject': 'Mathematics',
-            'qual_level_ranking': 16.0,
-            'category': 'Maths'
-        },
-        {
-            'qual_level': 'GCSE',
-            'subject': 'Algebra',
-            'qual_level_ranking': 16.0,
-            'category': 'Maths'
-        },
-        {
-            'qual_level': 'KS3',
-            'subject': 'Language',
-            'qual_level_ranking': 13.0,
-            'category': 'English'
-        },
-        {
-            'qual_level': 'Degree',
-            'subject': 'Mathematics',
-            'qual_level_ranking': 21.0,
-            'category': 'Maths'
-        },
+        {'qual_level': 'A Level', 'subject': 'Mathematics', 'qual_level_ranking': 18.0, 'category': 'Maths'},
+        {'qual_level': 'GCSE', 'subject': 'Mathematics', 'qual_level_ranking': 16.0, 'category': 'Maths'},
+        {'qual_level': 'GCSE', 'subject': 'Algebra', 'qual_level_ranking': 16.0, 'category': 'Maths'},
+        {'qual_level': 'KS3', 'subject': 'Language', 'qual_level_ranking': 13.0, 'category': 'English'},
+        {'qual_level': 'Degree', 'subject': 'Mathematics', 'qual_level_ranking': 21.0, 'category': 'Maths'},
     ],
     'labels': [],
     'last_updated': '2017-01-08T12:20:46.244Z',
     'created': '2015-01-19',
-    'release_timestamp': '2017-01-08T12:27:07.541165Z'
+    'release_timestamp': '2017-01-08T12:27:07.541165Z',
 }
 
 

diff --git a/deploy/compose b/deploy/compose
diff --git a/deploy/create-machine b/deploy/create-machine
diff --git a/deploy/deploy b/deploy/deploy
diff --git a/docker-compose.beta.yml b/docker-compose.beta.yml
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/heroku.yml b/heroku.yml
@@ -0,0 +1,4 @@
+build:
+  docker:
+    web: tcsocket/Dockerfile
+    worker: tcsocket/Dockerfile
diff --git a/nginx/dev/Dockerfile b/nginx/dev/Dockerfile
diff --git a/nginx/dev/nginx.conf b/nginx/dev/nginx.conf
diff --git a/nginx/prod/Dockerfile b/nginx/prod/Dockerfile