diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-02-23 15:30:58 +0000 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-02-23 15:30:58 +0000 |
| commit | 7f92a7280d94e4bf4dfa5507e35ad9ea540bd7bc (patch) | |
| tree | 5f9f1791ea31f765974087ae879f248f3a3c18be /docker | |
| parent | 019f8c055009933176735306c0693987d0353891 (diff) | |
| download | troggle-7f92a7280d94e4bf4dfa5507e35ad9ea540bd7bc.tar.gz troggle-7f92a7280d94e4bf4dfa5507e35ad9ea540bd7bc.tar.bz2 troggle-7f92a7280d94e4bf4dfa5507e35ad9ea540bd7bc.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 21 | ||||
| l---------[-rw-r--r--] | docker/requirements.txt | 8 |
3 files changed, 25 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c11a8b0..5f45b8e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,4 +23,6 @@ EXPOSE 8000 WORKDIR /expo/troggle -#CMD ["python","manage.py","runserver","0.0.0.0:8000"]
\ No newline at end of file +#CMD ["python","manage.py","migrate"] + +ENTRYPOINT ["python","manage.py","runserver","0.0.0.0:8000"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..08b969e --- /dev/null +++ b/docker/docker-compose.yml @@ -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:
\ No newline at end of file diff --git a/docker/requirements.txt b/docker/requirements.txt index 15ab393..d561bd8 100644..120000 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -1,7 +1 @@ -Django==1.7.11 -django-registration==2.1.2 -mysql -imagekit -Image -django-tinymce==2.7.0 -smartencoding +requirements.txt.dj-1.7.11
\ No newline at end of file |