From c73825da901c7b047a8be532fd489ac6a460bd07 Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Wed, 18 Sep 2019 19:59:36 +0200
Subject: Nuke `pysite.dockerapp`.

---
 docker/pysite.dockerapp | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 docker/pysite.dockerapp

diff --git a/docker/pysite.dockerapp b/docker/pysite.dockerapp
deleted file mode 100644
index 4e90ff87..00000000
--- a/docker/pysite.dockerapp
+++ /dev/null
@@ -1,42 +0,0 @@
-version: 0.3.0
-name: pysite
-description: |
-    Our community website, built on Django and PostgreSQL.
-namespace: python-discord
-maintainers:
-  - name: Johannes Christ
-    email: jc@jchri.st
-
----
-version: "3.6"
-services:
-    django:
-        build:
-            context: .
-        command: docker/app/scripts/migrate_and_serve.sh
-        ports:
-            - "127.0.0.1:4000:4000"
-        environment:
-            DATABASE_URL: "postgres://${pg_user}:${pg_passwd}@${pg_host}/${pg_db}"
-            DEBUG: 'false'
-            SECRET_KEY: "${secret_key}"
-        depends_on:
-            - postgres
-
-    postgres:
-        image: postgres:11-alpine
-        ports:
-            - "127.0.0.1:5432:5432"
-        environment:
-            POSTGRES_DB: "${pg_db}"
-            POSTGRES_USER: "${pg_user}"
-            POSTGRES_PASSWORD: "${pg_passwd}"
-
----
-pg_user: pysite
-pg_db: pysite
-pg_passwd: supersecretpassword
-pg_host: postgres
-secret_key: 'suitable-for-development-only'
-
-# vim: ft=yaml:
-- 
cgit v1.2.3


From f2951fddfdebbee2d7a445b58b52d1cf8ced7ac8 Mon Sep 17 00:00:00 2001
From: Daniel Brown <browndj3@gmail.com>
Date: Fri, 20 Sep 2019 16:16:53 -0500
Subject: Line Ending Fix Added .gitattributes to prevent Windows users from
 accidentally cloning the repo and getting incorrect line endings

Also adjusting the shebang for the migrate_and_serve.sh to prevent another Windows related bug
---
 .gitattributes                          | 3 +++
 docker/app/scripts/migrate_and_serve.sh | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..a90a0a96
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Declare files that will always have LF line endings on checkout
+# This prevents git on Windows from automatically inserting CRLF line endings
+* text=auto eol=lf
\ No newline at end of file
diff --git a/docker/app/scripts/migrate_and_serve.sh b/docker/app/scripts/migrate_and_serve.sh
index 0b54a2e5..c30d7e04 100755
--- a/docker/app/scripts/migrate_and_serve.sh
+++ b/docker/app/scripts/migrate_and_serve.sh
@@ -1,4 +1,5 @@
-#!/bin/sh -eu
+#!/bin/sh
+set -eu
 
 ### NOTE
 # This file is intended to be used by local setups.
-- 
cgit v1.2.3