diff options
| -rw-r--r-- | .gitattributes | 3 | ||||
| -rwxr-xr-x | docker/app/scripts/migrate_and_serve.sh | 3 | ||||
| -rw-r--r-- | docker/pysite.dockerapp | 42 |
3 files changed, 5 insertions, 43 deletions
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. 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: [email protected] - ---- -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: |