Merge pull request seanshoffman#1 from pluralsight-projects/dockerfil…

…e-and-structure add Dockerfile and flatten folder structure by 1 level
luismu78 · Nov 18, 2019 · 24db2d7 · 24db2d7
2 parents 4c6e529 + e2a8a43
commit 24db2d7
Show file tree

Hide file tree

Showing 54 changed files with 19 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -1 +1,14 @@
+FROM python:3.7-alpine
 
+WORKDIR /src/app/
+
+COPY ./requirements.txt .
+
+RUN ["pip", "install", "-r", "./requirements.txt"]
+
+COPY . .
+
+RUN addgroup -S projects && adduser -S -H projects -G projects
+RUN chown -R projects:projects /src/app
+
+USER projects
diff --git a/blogproj/blogproj/__init__.py → blogproj/__init__.py b/blogproj/blogproj/__init__.py → blogproj/__init__.py
diff --git a/blogproj/blogproj/settings.py → blogproj/settings.py b/blogproj/blogproj/settings.py → blogproj/settings.py
@@ -15,6 +15,9 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
+TEST_OUTPUT_DIR = BASE_DIR
+TEST_OUTPUT_FILE_NAME = '.report.xml'
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
@@ -128,4 +131,4 @@
 LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = 'index'
 
-AUTH_USER_MODEL = 'users.User'
+AUTH_USER_MODEL = 'users.User'
diff --git a/blogproj/blogproj/urls.py → blogproj/urls.py b/blogproj/blogproj/urls.py → blogproj/urls.py
diff --git a/blogproj/blogproj/views.py → blogproj/views.py b/blogproj/blogproj/views.py → blogproj/views.py
diff --git a/blogproj/blogproj/wsgi.py → blogproj/wsgi.py b/blogproj/blogproj/wsgi.py → blogproj/wsgi.py
diff --git a/blogproj/mainapp/__init__.py → mainapp/__init__.py b/blogproj/mainapp/__init__.py → mainapp/__init__.py
diff --git a/blogproj/mainapp/admin.py → mainapp/admin.py b/blogproj/mainapp/admin.py → mainapp/admin.py
diff --git a/blogproj/mainapp/apps.py → mainapp/apps.py b/blogproj/mainapp/apps.py → mainapp/apps.py
diff --git a/blogproj/mainapp/migrations/0001_initial.py → mainapp/migrations/0001_initial.py b/blogproj/mainapp/migrations/0001_initial.py → mainapp/migrations/0001_initial.py
diff --git a/...app/migrations/0002_auto_20191004_0501.py → ...app/migrations/0002_auto_20191004_0501.py b/...app/migrations/0002_auto_20191004_0501.py → ...app/migrations/0002_auto_20191004_0501.py
diff --git a/blogproj/mainapp/migrations/__init__.py → mainapp/migrations/__init__.py b/blogproj/mainapp/migrations/__init__.py → mainapp/migrations/__init__.py
diff --git a/blogproj/mainapp/models.py → mainapp/models.py b/blogproj/mainapp/models.py → mainapp/models.py
diff --git a/...templates/mainapp/filtered_post_list.html → ...templates/mainapp/filtered_post_list.html b/...templates/mainapp/filtered_post_list.html → ...templates/mainapp/filtered_post_list.html
diff --git a/...proj/mainapp/templates/mainapp/index.html → mainapp/templates/mainapp/index.html b/...proj/mainapp/templates/mainapp/index.html → mainapp/templates/mainapp/index.html
diff --git a/blogproj/mainapp/templates/mainapp/post.html → mainapp/templates/mainapp/post.html b/blogproj/mainapp/templates/mainapp/post.html → mainapp/templates/mainapp/post.html
diff --git a/.../templates/mainapp/snippet_post_link.html → .../templates/mainapp/snippet_post_link.html b/.../templates/mainapp/snippet_post_link.html → .../templates/mainapp/snippet_post_link.html
diff --git a/...templates/mainapp/snippet_tag_labels.html → ...templates/mainapp/snippet_tag_labels.html b/...templates/mainapp/snippet_tag_labels.html → ...templates/mainapp/snippet_tag_labels.html
diff --git a/blogproj/mainapp/tests.py → mainapp/tests.py b/blogproj/mainapp/tests.py → mainapp/tests.py
diff --git a/blogproj/mainapp/urls.py → mainapp/urls.py b/blogproj/mainapp/urls.py → mainapp/urls.py
diff --git a/blogproj/mainapp/views.py → mainapp/views.py b/blogproj/mainapp/views.py → mainapp/views.py
diff --git a/blogproj/manage.py → manage.py b/blogproj/manage.py → manage.py
diff --git a/blogproj/module1/tests.py → module1/tests.py b/blogproj/module1/tests.py → module1/tests.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
 Django==2.2.5
 pytz==2019.2
+six==1.13.0
 sqlparse==0.3.0
+unittest-xml-reporting==2.5.2
diff --git a/blogproj/static/apple-touch-icon.png → static/apple-touch-icon.png b/blogproj/static/apple-touch-icon.png → static/apple-touch-icon.png
diff --git a/blogproj/static/browserconfig.xml → static/browserconfig.xml b/blogproj/static/browserconfig.xml → static/browserconfig.xml
diff --git a/blogproj/static/css/main.css → static/css/main.css b/blogproj/static/css/main.css → static/css/main.css
diff --git a/blogproj/static/favicon.ico → static/favicon.ico b/blogproj/static/favicon.ico → static/favicon.ico
diff --git a/blogproj/static/fonts/GothamBold.ttf → static/fonts/GothamBold.ttf b/blogproj/static/fonts/GothamBold.ttf → static/fonts/GothamBold.ttf
diff --git a/blogproj/static/fonts/GothamBook.ttf → static/fonts/GothamBook.ttf b/blogproj/static/fonts/GothamBook.ttf → static/fonts/GothamBook.ttf
diff --git a/blogproj/static/fonts/GothamMedium.ttf → static/fonts/GothamMedium.ttf b/blogproj/static/fonts/GothamMedium.ttf → static/fonts/GothamMedium.ttf
diff --git a/...ic/fonts/glyphicons-halflings-regular.eot → ...ic/fonts/glyphicons-halflings-regular.eot b/...ic/fonts/glyphicons-halflings-regular.eot → ...ic/fonts/glyphicons-halflings-regular.eot
diff --git a/...ic/fonts/glyphicons-halflings-regular.svg → ...ic/fonts/glyphicons-halflings-regular.svg b/...ic/fonts/glyphicons-halflings-regular.svg → ...ic/fonts/glyphicons-halflings-regular.svg
diff --git a/...ic/fonts/glyphicons-halflings-regular.ttf → ...ic/fonts/glyphicons-halflings-regular.ttf b/...ic/fonts/glyphicons-halflings-regular.ttf → ...ic/fonts/glyphicons-halflings-regular.ttf
diff --git a/...c/fonts/glyphicons-halflings-regular.woff → ...c/fonts/glyphicons-halflings-regular.woff b/...c/fonts/glyphicons-halflings-regular.woff → ...c/fonts/glyphicons-halflings-regular.woff
diff --git a/blogproj/static/index.html → static/index.html b/blogproj/static/index.html → static/index.html
diff --git a/blogproj/static/js/main.js → static/js/main.js b/blogproj/static/js/main.js → static/js/main.js
diff --git a/...ndor/modernizr-2.8.3-respond-1.4.2.min.js → ...ndor/modernizr-2.8.3-respond-1.4.2.min.js b/...ndor/modernizr-2.8.3-respond-1.4.2.min.js → ...ndor/modernizr-2.8.3-respond-1.4.2.min.js
diff --git a/blogproj/static/js/vendor/npm.js → static/js/vendor/npm.js b/blogproj/static/js/vendor/npm.js → static/js/vendor/npm.js
diff --git a/blogproj/static/tile-wide.png → static/tile-wide.png b/blogproj/static/tile-wide.png → static/tile-wide.png
diff --git a/blogproj/static/tile.png → static/tile.png b/blogproj/static/tile.png → static/tile.png
diff --git a/blogproj/templates/base.html → templates/base.html b/blogproj/templates/base.html → templates/base.html
diff --git a/blogproj/users/__init__.py → users/__init__.py b/blogproj/users/__init__.py → users/__init__.py
diff --git a/blogproj/users/admin.py → users/admin.py b/blogproj/users/admin.py → users/admin.py
diff --git a/blogproj/users/apps.py → users/apps.py b/blogproj/users/apps.py → users/apps.py
diff --git a/blogproj/users/forms.py → users/forms.py b/blogproj/users/forms.py → users/forms.py
diff --git a/blogproj/users/migrations/0001_initial.py → users/migrations/0001_initial.py b/blogproj/users/migrations/0001_initial.py → users/migrations/0001_initial.py
diff --git a/blogproj/users/migrations/__init__.py → users/migrations/__init__.py b/blogproj/users/migrations/__init__.py → users/migrations/__init__.py
diff --git a/blogproj/users/models.py → users/models.py b/blogproj/users/models.py → users/models.py
diff --git a/...j/users/templates/registration/login.html → users/templates/registration/login.html b/...j/users/templates/registration/login.html → users/templates/registration/login.html
diff --git a/...sers/templates/registration/register.html → users/templates/registration/register.html b/...sers/templates/registration/register.html → users/templates/registration/register.html
diff --git a/blogproj/users/tests.py → users/tests.py b/blogproj/users/tests.py → users/tests.py
diff --git a/blogproj/users/urls.py → users/urls.py b/blogproj/users/urls.py → users/urls.py
diff --git a/blogproj/users/views.py → users/views.py b/blogproj/users/views.py → users/views.py