dockerfile update

Author: deadlycoder07

Dockerfile

@@ -1,9 +1,12 @@
-FROM python:3
+FROM amazon/aws-eb-python:3.4.2-onbuild-3.5.1
+
+# Expose port
+EXPOSE 8080
 ENV PYTHONUNBUFFERED 1
 RUN python -m pip install --upgrade pip
-RUN mkdir /code
-WORKDIR /code
+RUN mkdir /var/app
+WORKDIR /var/app    
 COPY requirements.txt /code/
 RUN pip install -r requirements.txt
-COPY . /code/
-
+COPY . /var/app/. 
+ EXPOSE 8000

Dockerrun.aws.json

@@ -0,0 +1,11 @@
+{
+    "AWSEBDockerrunVersion": "5",
+    "Volumes": [
+      {
+        "ContainerDirectory": "/var/app",
+        "HostDirectory": "/var/app",
+        "ContainerPort": "8080"
+      }
+    ],
+    "Logging": "/var/app/eb_log"
+  }

Procfile

@@ -4,12 +4,17 @@ services:
   db:
     image: postgres
     environment:
-      - POSTGRES_DB=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+      - DJANGO_SETTINGS_MODULE=settings.production
+      - RDS_DB_NAME=postgres
+      - RDS_USERNAME=postgres
+      - RDS_PASSWORD='postgres'
+      - RDS_HOSTNAME=db
+      - RDS_PORT=5432
   web:
     build: .
     command: gunicorn screencast.wsgi:application --bind 0.0.0.0:8000
+    volumes:
+      - .:/var/app
     ports:
       - "8000:8000"
     depends_on:

docker-compose.yml

@@ -12,7 +12,6 @@
 
 import os
 from datetime import timedelta
-import django_heroku
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -43,9 +42,6 @@
     'api',
     'rest_framework',
     'corsheaders',
-    'rest_framework_social_oauth2',
-    'oauth2_provider',
-    'social_django',
 ]
 
 MIDDLEWARE = [
@@ -95,16 +91,6 @@
 WSGI_APPLICATION = 'screencast.wsgi.application'
 CORS_ORIGIN_ALLOW_ALL = True
 
-
-# Database
-# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
-#DATABASES = {
-    #'default': {
-       # 'ENGINE': 'django.db.backends.sqlite3',
-        #'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-   # }
-#}
 if 'RDS_DB_NAME' in os.environ:
     DATABASES = {
         'default': {
@@ -123,7 +109,7 @@
         'NAME': 'postgres',
         'USER': 'postgres',
         'PASSWORD': 'postgres',
-        'HOST': 'postgres',
+        'HOST': 'db',
         'PORT': '5432',
     }
 }
@@ -182,41 +168,6 @@
 MEDIA_URL='/media/'
 MEDIA_ROOT=os.path.join(BASE_DIR,' media')
 
-# Facebook configuration
-SOCIAL_AUTH_FACEBOOK_KEY = ''
-SOCIAL_AUTH_FACEBOOK_SECRET = ''
-#SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/'
-# Google configuration
-SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = '417817522855-24jn957g7r6a5nqnlomfq47esqt0ns9v.apps.googleusercontent.com'
-SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = 'nZUZevgPjTYFzWJT4_Qj9yKd'
-
-# Define SOCIAL_AUTH_FACEBOOK_SCOPE to get extra permissions from facebook. Email is not sent by default, to get it, you must request the email permission:
-SOCIAL_AUTH_FACEBOOK_SCOPE = ['email']
-SOCIAL_AUTH_FACEBOOK_PROFILE_EXTRA_PARAMS = {
-'fields': 'id, name, email' }
-SOCIAL_AUTH_FACEBOOK_SCOPE = ['email']
-FACEBOOK_EXTENDED_PERMISSIONS = ['email']
-
-# Define SOCIAL_AUTH_GOOGLE_OAUTH2_SCOPE to get extra permissions from Google.
-SOCIAL_AUTH_GOOGLE_OAUTH2_SCOPE = [
-    'https://www.googleapis.com/auth/userinfo.email',
-    'https://www.googleapis.com/auth/userinfo.profile',
-]
-SOCIAL_AUTH_ADMIN_USER_SEARCH_FIELDS = ['username', 'first_name', 'email']
-SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL = True
-
-SOCIAL_AUTH_PIPELINE = (
-'social_core.pipeline.social_auth.social_details',
-'social_core.pipeline.social_auth.social_uid',
-'social_core.pipeline.social_auth.auth_allowed',
-'social_core.pipeline.social_auth.social_user',
-'social_core.pipeline.user.get_username',
-'social_core.pipeline.social_auth.associate_by_email',
-'social_core.pipeline.user.create_user',
-'social_core.pipeline.social_auth.associate_user',
-'social_core.pipeline.social_auth.load_extra_data',
-'social_core.pipeline.user.user_details', )
-
 SIMPLE_JWT = {
     'ACCESS_TOKEN_LIFETIME': timedelta( days=3),
     'REFRESH_TOKEN_LIFETIME': timedelta(days=2),
@@ -235,6 +186,4 @@
     'SLIDING_TOKEN_REFRESH_EXP_CLAIM': 'refresh_exp',
     'SLIDING_TOKEN_LIFETIME': timedelta(minutes=30),
     'SLIDING_TOKEN_REFRESH_LIFETIME': timedelta(days=1),
-}
-
-django_heroku.settings(locals())
+}