From 4b7fea00ac9e1c5710f3baa3e37a69de0c2734dc Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 31 Jul 2018 10:52:34 +0200 Subject: [PATCH] Back to 9100 for dev port, add timeside local lib for dev --- README.rst | 2 +- doc/pelican-themes | 2 +- env/dev.yml | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 66d96a6f..3c8c962e 100644 --- a/README.rst +++ b/README.rst @@ -213,7 +213,7 @@ To start the application in a development environment setup, first read / edit ` git checkout dev docker-compose -f docker-compose.yml -f env/dev.yml up -Then browse the app at http://localhost:8000/ (replacing 'localhost' by the IP given by the docker terminal on OSX or Windows). Note that the service will automatically be reloaded when any code of the app is modified. +Then browse the app at http://localhost:9100/ (replacing 'localhost' by the IP given by the docker terminal on OSX or Windows). Note that the service will automatically be reloaded when any code of the app is modified. You are welcome to participate to the development by forking the Telemeta project on GitHub_, using it as if it were the original and submitting your changes through a Pull Request on the **dev branch ONLY**. diff --git a/doc/pelican-themes b/doc/pelican-themes index 2066cb02..a3e097c7 160000 --- a/doc/pelican-themes +++ b/doc/pelican-themes @@ -1 +1 @@ -Subproject commit 2066cb022da2ed06a6ed035b99f960f2034aa415 +Subproject commit a3e097c775c385ed6bb1bb70ab7d7ed24dc962b3 diff --git a/env/dev.yml b/env/dev.yml index 9f213029..c0cde07a 100644 --- a/env/dev.yml +++ b/env/dev.yml @@ -28,12 +28,16 @@ app: - env/debug.env command: /bin/bash bin/app.sh --runserver ports: - - 8000:8000 + - 9100:8000 + volumes: + - ./lib/TimeSide:/srv/lib/timeside worker: image: parisson/telemeta:latest-dev env_file: - env/debug.env + volumes: + - ./lib/TimeSide:/srv/lib/timeside db: volumes: -- 2.39.5