Skip to content

Commit

Permalink
Merge pull request #104 from leifmadsen/master
Browse files Browse the repository at this point in the history
Remove some trailing whitespace
  • Loading branch information
leifmadsen authored Mar 13, 2017
2 parents 877123a + fe775e5 commit 56c3200
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ version: '2'

# docker-compose file to launch jenkins_master/ELK stack instead of VM.
services:

jenkins_master:
build:
context: ./dockerfiles
build:
context: ./dockerfiles
dockerfile: centos7_base
container_name: jenkins_master
entrypoint: /sbin/init
Expand All @@ -23,8 +24,8 @@ services:
- "8080:8080"

logstash:
build:
context: ./dockerfiles
build:
context: ./dockerfiles
dockerfile: centos7_base
container_name: logstash
entrypoint: /sbin/init
Expand All @@ -42,8 +43,8 @@ services:
- "5044:5044"

elasticsearch:
build:
context: ./dockerfiles
build:
context: ./dockerfiles
dockerfile: centos7_base
container_name: elasticsearch
entrypoint: /sbin/init
Expand All @@ -62,8 +63,8 @@ services:
- "9200:9200"

kibana:
build:
context: ./dockerfiles
build:
context: ./dockerfiles
dockerfile: centos7_base
container_name: kibana
entrypoint: /sbin/init
Expand Down

0 comments on commit 56c3200

Please sign in to comment.