From: Pierre Ozoux <pierre@ozoux.net>
Date: Sat, 15 Apr 2017 00:07:59 +0000 (+0100)
Subject: Use image too in docker-compose (#1109)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0d2910478a6b1659f4c40e64cf28cf2e64dfb01e;p=mastodon.git

Use image too in docker-compose (#1109)

* Use image too in docker-compose

It is possible with version 2 of compose to use both `build` and `image`

* Update docker-compose.yml
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 910bf8cfe..81c6fe981 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,7 @@ services:
   web:
     restart: always
     build: .
+    image: gargron/mastodon
     env_file: .env.production
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     ports:
@@ -32,6 +33,7 @@ services:
   streaming:
     restart: always
     build: .
+    image: gargron/mastodon
     env_file: .env.production
     command: npm run start
     ports:
@@ -43,6 +45,7 @@ services:
   sidekiq:
     restart: always
     build: .
+    image: gargron/mastodon
     env_file: .env.production
     command: bundle exec sidekiq -q default -q mailers -q pull -q push
     depends_on: