Prevent troggle adding the menu if there is one in the file

Add a Docker compose file to bring up a dev troggle easily
Various PEP improvments
This commit is contained in:
Sam Wenham
2019-02-23 15:30:58 +00:00
parent f58b1db920
commit a1f02e575f
10 changed files with 77 additions and 18 deletions

View File

@@ -23,4 +23,6 @@ EXPOSE 8000
WORKDIR /expo/troggle
#CMD ["python","manage.py","runserver","0.0.0.0:8000"]
#CMD ["python","manage.py","migrate"]
ENTRYPOINT ["python","manage.py","runserver","0.0.0.0:8000"]

21
docker/docker-compose.yml Normal file
View File

@@ -0,0 +1,21 @@
version: '3'
services:
troggle:
restart: always
build: .
ports:
- "8000:8000"
volumes:
- ../..:/expo
links:
- expo-mysql
expo-mysql:
restart: always
image: "mariadb"
env_file:
- compose/mysql.env
volumes:
- mysqldb:/var/lib/mysql
volumes:
mysqldb:

View File

@@ -1,7 +0,0 @@
Django==1.7.11
django-registration==2.1.2
mysql
imagekit
Image
django-tinymce==2.7.0
smartencoding

1
docker/requirements.txt Symbolic link
View File

@@ -0,0 +1 @@
requirements.txt.dj-1.7.11