Skip to content

Commit

Permalink
Merge pull request #707 from awesto/releases/0.11.x
Browse files Browse the repository at this point in the history
Releases/0.11.x
  • Loading branch information
jrief committed Feb 7, 2018
2 parents 8b88154 + 9b7f80f commit 51125d3
Show file tree
Hide file tree
Showing 25 changed files with 459 additions and 1,112 deletions.
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
*
!docker-files/
!email_auth/
!example/
!shop/
!requirements/
!setup.py
!package.json
!README.md
!LICENSE.txt
!MANIFEST.in
50 changes: 0 additions & 50 deletions Dockerfile

This file was deleted.

76 changes: 76 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
version: '2.0'

services:
postgresdb:
restart: always
image: postgres
env_file:
- example/docker-files/environ
volumes:
- pgdata:/var/lib/postgresql/data
networks:
- shopnet

redishost:
image: redis
volumes:
- 'redisdata:/data'
networks:
- shopnet

elasticsearch:
image: elasticsearch:1.7.5
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
memlock:
soft: -1
hard: -1
volumes:
- esdata:/usr/share/elasticsearch/data
ports:
- 9200:9200
networks:
- shopnet

wsgiapp:
restart: always
build:
context: .
dockerfile: example/docker-files/Dockerfile
image: demoshop
environment:
- DJANGO_SHOP_TUTORIAL
- POSTGRES_DB=myshop_$DJANGO_SHOP_TUTORIAL
- DJANGO_EMAIL_HOST
- DJANGO_EMAIL_PORT
- DJANGO_EMAIL_USER
- DJANGO_EMAIL_PASSWORD
- DJANGO_EMAIL_USE_TLS
- DJANGO_EMAIL_FROM
- DJANGO_EMAIL_REPLY_TO
env_file:
- example/docker-files/environ
volumes:
- shopmedia:/web/workdir
depends_on:
- postgresdb
- redishost
- elasticsearch
networks:
- shopnet
command: uwsgi --ini uwsgi.ini
ports:
- 9009:9009

networks:
shopnet:

volumes:
pgdata:
redisdata:
shopmedia:
esdata:
32 changes: 0 additions & 32 deletions docker-files/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions docker-files/elasticsearch.ini

This file was deleted.

0 comments on commit 51125d3

Please sign in to comment.