From cb92f837397a9b309fb690dbdf0a0b3c9ed90005 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 13 Apr 2016 13:30:09 +0200 Subject: [PATCH] use source code in prod, update pages --- doc/content/TM-1.6.rst | 2 +- docker-compose.yml | 1 + env/dev.yml | 5 +---- telemeta/pages | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/content/TM-1.6.rst b/doc/content/TM-1.6.rst index b5e550c4..47519091 100644 --- a/doc/content/TM-1.6.rst +++ b/doc/content/TM-1.6.rst @@ -1,4 +1,4 @@ - Telemeta 1.6 is finally out! +Telemeta 1.6 is finally out! ############################ :category: Releases diff --git a/docker-compose.yml b/docker-compose.yml index 89cdd3c6..95de519f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,6 +50,7 @@ app: build: . volumes: - ./app/:/srv/app + - ./telemeta/:/srv/src/telemeta/telemeta volumes_from: - data env_file: diff --git a/env/dev.yml b/env/dev.yml index 94ef14ad..4667e01e 100644 --- a/env/dev.yml +++ b/env/dev.yml @@ -23,14 +23,11 @@ app: - volumes: - - ./app/:/srv/app - - ./telemeta/:/srv/src/telemeta/telemeta env_file: - env/debug.env command: /bin/sh deploy/app.sh --runserver ports: - - 9000:8000 + - 8000:8000 worker: env_file: diff --git a/telemeta/pages b/telemeta/pages index 1087a9f3..407d2d26 160000 --- a/telemeta/pages +++ b/telemeta/pages @@ -1 +1 @@ -Subproject commit 1087a9f359bba4eaac993eaa9837cade49e5f503 +Subproject commit 407d2d269d081176f8f7548d9e2371076eebc879 -- 2.39.5