diff options
| author |  Hasan-Ahmad <[email protected]> | 2018-10-16 22:41:53 +0100 |
|---|---|---|
| committer | Hasan-Ahmad <[email protected]> | 2018-10-16 22:41:53 +0100 |
| commit | b5a29905ce019a037ca282b0dbe6687c0b570906 (patch) | |
| tree | 66f92f9d6328e2ad4484bf412cebe3057af7056a /docker/pysite.dockerapp | |
| parent | exterminated trailing comma, fixed imports 2 per line (diff) | |
| parent | Add `docker` tag to use proper runners. (diff) | |
Merge branch 'django' of https://gitlab.com/python-discord/projects/site into snake_facts
Gitlab-ci thing
Diffstat (limited to 'docker/pysite.dockerapp')
| -rw-r--r-- | docker/pysite.dockerapp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/docker/pysite.dockerapp b/docker/pysite.dockerapp index 4a811861..dc472b2e 100644 --- a/docker/pysite.dockerapp +++ b/docker/pysite.dockerapp @@ -1,8 +1,8 @@ -version: 0.1.0 +version: 0.3.0 name: pysite description: | Our community website, built on Django and PostgreSQL. -#namespace: python-discord +namespace: python-discord maintainers: - name: Johannes Christ email: [email protected] @@ -11,15 +11,16 @@ maintainers: version: "3.6" services: django: - image: registry.gitlab.com/python-discord/projects/site/django:latest + build: + context: . + command: docker/app/migrate_and_serve.sh ports: - "127.0.0.1:4000:4000" environment: DATABASE_URL: "postgres://${pg_user}:${pg_passwd}@${pg_host}/${pg_db}" - DEBUG: 0 + DEBUG: 'false' SECRET_KEY: "${secret_key}" depends_on: - - migrator - postgres postgres: @@ -29,20 +30,10 @@ services: POSTGRES_USER: "${pg_user}" POSTGRES_PASSWORD: "${pg_passwd}" - migrator: - image: registry.gitlab.com/python-discord/projects/site/django:latest - environment: - DATABASE_URL: "postgres://${pg_user}:${pg_passwd}@${pg_host}/${pg_db}" - DEBUG: 0 - SECRET_KEY: "${secret_key}" - command: "python manage.py migrate" - depends_on: - - postgres - --- pg_user: pysite pg_db: pysite -pg_passwd: '' +pg_passwd: supersecretpassword pg_host: postgres secret_key: 'suitable-for-development-only' |