diff --git a/dev.yml b/dev.yml deleted file mode 100644 index e250435..0000000 --- a/dev.yml +++ /dev/null @@ -1,68 +0,0 @@ -version: '2' - -volumes: - postgres_data_dev: {} - postgres_backup_dev: {} - -services: - postgres: - build: ./compose/postgres - volumes: - - postgres_data_dev:/var/lib/postgresql/data - - postgres_backup_dev:/backups - env_file: .env - - django: - build: - context: . - dockerfile: ./compose/django/Dockerfile-dev - command: /start-dev.sh - depends_on: - - postgres - env_file: .env - volumes: - - .:/app - ports: - - "8180:8000" - links: - - postgres - - mailhog - - mailhog: - image: mailhog/mailhog - ports: - - "8125:8025" - - redis: - image: redis:latest - - celeryworker: - build: - context: . - dockerfile: ./compose/django/Dockerfile-dev - env_file: .env - volumes: - - .:/app - depends_on: - - postgres - - redis - command: celery -A mhackspace.celeryapp worker -l INFO - - celerybeat: - build: - context: . - dockerfile: ./compose/django/Dockerfile-dev - env_file: .env - volumes: - - .:/app - depends_on: - - postgres - - redis - command: celery -A mhackspace.celeryapp beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler - - bucket: - image: minio/minio - env_file: .env - volumes: - - ./mhackspace:/data - command: server /data diff --git a/env.example b/env.example index 8d7451e..5447f7c 100644 --- a/env.example +++ b/env.example @@ -55,3 +55,6 @@ GOCARDLESS_MERCHANT_ID=demo MATRIX_ROOM=fmCpNwqgIiuwATlcdw:matrix.org MATRIX_USERNAME=mhackspace MATRIX_PASSWORD= + +MINIO_ACCESS_KEY=thing +MINIO_SECRET_KEY=thing diff --git a/requirements/base.txt b/requirements/base.txt index da30242..94e7b75 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -100,3 +100,4 @@ django-celery-beat==1.0.1 argon2-cffi django-cors-headers +magic