From: Florent Fayolle <florent.fayolle69@gmail.com>
Date: Mon, 30 Apr 2018 15:26:07 +0000 (+0200)
Subject: Adapt docker image file path in docker-compose.yml
X-Git-Tag: v1.0.0-beta.4~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4b431d519c6fb0feadb1339dfddcc889b9d33cfe;p=oweals%2Fpeertube.git

Adapt docker image file path in docker-compose.yml
---

diff --git a/support/doc/docker.md b/support/doc/docker.md
index e0c03a1dc..093d7124e 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -22,7 +22,7 @@ production, you can use a `docker-compose` setup.
 
 ```bash
 $ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
-$ cd /tmp/peertube/support/docker/production
+$ cd /tmp/peertube
 ```
 
 Then tweak the `docker-compose.yml` file there according to your needs. Then
@@ -37,7 +37,7 @@ $ PEERTUBE_HOSTNAME=peertube.lvh.me \
   PEERTUBE_SMTP_HOST=mail.lvh.me \
   PEERTUBE_SMTP_PORT=1025 \
   PEERTUBE_SMTP_FROM=noreply@peertube.lvh.me \
-    docker-compose up
+    docker-compose -f support/docker/production/docker-compose.yml --project-directory . up
 ```
 
 Other environment variables are used in
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index ac0a3543b..a7bac47c2 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   peertube:
     build:
       context: .
-      dockerfile: ./Dockerfile.stretch
+      dockerfile: ./support/docker/production/Dockerfile.stretch
     image: chocobozzz/peertube:production-stretch
     environment:
       PEERTUBE_HOSTNAME: my.domain.tld