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
This commit is contained in:
		
							parent
							
								
									5ab0ffc6c8
								
							
						
					
					
						commit
						0d2910478a
					
				@ -18,6 +18,7 @@ services:
 | 
				
			|||||||
  web:
 | 
					  web:
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
 | 
					    image: gargron/mastodon
 | 
				
			||||||
    env_file: .env.production
 | 
					    env_file: .env.production
 | 
				
			||||||
    command: bundle exec rails s -p 3000 -b '0.0.0.0'
 | 
					    command: bundle exec rails s -p 3000 -b '0.0.0.0'
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@ -32,6 +33,7 @@ services:
 | 
				
			|||||||
  streaming:
 | 
					  streaming:
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
 | 
					    image: gargron/mastodon
 | 
				
			||||||
    env_file: .env.production
 | 
					    env_file: .env.production
 | 
				
			||||||
    command: npm run start
 | 
					    command: npm run start
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@ -43,6 +45,7 @@ services:
 | 
				
			|||||||
  sidekiq:
 | 
					  sidekiq:
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    build: .
 | 
					    build: .
 | 
				
			||||||
 | 
					    image: gargron/mastodon
 | 
				
			||||||
    env_file: .env.production
 | 
					    env_file: .env.production
 | 
				
			||||||
    command: bundle exec sidekiq -q default -q mailers -q pull -q push
 | 
					    command: bundle exec sidekiq -q default -q mailers -q pull -q push
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user