Merge pull request #132 from Brightscout/master
Fix Dockerrun.aws.json so that it works with the latest docker setup
This commit is contained in:
		
						commit
						5a022ac7c1
					
				@ -13,14 +13,49 @@
 | 
				
			|||||||
                "sourcePath": "/var/app/current/app/mattermost/data"
 | 
					                "sourcePath": "/var/app/current/app/mattermost/data"
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            "name": "app-logs",
 | 
				
			||||||
 | 
					            "host": {
 | 
				
			||||||
 | 
					                "sourcePath": "/var/app/current/app/mattermost/logs"
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "name": "db-data",
 | 
					            "name": "db-data",
 | 
				
			||||||
            "host": {
 | 
					            "host": {
 | 
				
			||||||
                "sourcePath": "/var/app/current/db/mattermost/var/lib/postgresql/data"
 | 
					                "sourcePath": "/var/app/current/db/mattermost/var/lib/postgresql/data"
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            "name": "web-cert",
 | 
				
			||||||
 | 
					            "host": {
 | 
				
			||||||
 | 
					                "sourcePath": "/var/app/current/web/cert"
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    "containerDefinitions": [
 | 
					    "containerDefinitions": [
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            "name": "db",
 | 
				
			||||||
 | 
					            "image": "mattermost/mattermost-prod-db:latest",
 | 
				
			||||||
 | 
					            "memory": 128,
 | 
				
			||||||
 | 
					            "mountPoints": [
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    "sourceVolume": "db-data",
 | 
				
			||||||
 | 
					                    "containerPath": "/var/lib/postgresql/data"
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            ],
 | 
				
			||||||
 | 
					            "environment": [
 | 
				
			||||||
 | 
					              {
 | 
				
			||||||
 | 
					                "name": "POSTGRES_USER",
 | 
				
			||||||
 | 
					                "value": "mmuser"
 | 
				
			||||||
 | 
					              }, {
 | 
				
			||||||
 | 
					                "name": "POSTGRES_PASSWORD",
 | 
				
			||||||
 | 
					                "value": "mmuser_password"
 | 
				
			||||||
 | 
					              }, {
 | 
				
			||||||
 | 
					                "name": "POSTGRES_DB",
 | 
				
			||||||
 | 
					                "value": "mattermost"
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "name": "app",
 | 
					            "name": "app",
 | 
				
			||||||
            "image": "mattermost/mattermost-prod-app:latest",
 | 
					            "image": "mattermost/mattermost-prod-app:latest",
 | 
				
			||||||
@ -33,12 +68,10 @@
 | 
				
			|||||||
                {
 | 
					                {
 | 
				
			||||||
                    "sourceVolume": "app-data",
 | 
					                    "sourceVolume": "app-data",
 | 
				
			||||||
                    "containerPath": "/mattermost/data"
 | 
					                    "containerPath": "/mattermost/data"
 | 
				
			||||||
                }
 | 
					                },
 | 
				
			||||||
            ],
 | 
					 | 
				
			||||||
            "portMappings": [
 | 
					 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "hostPort": 80,
 | 
					                    "sourceVolume": "app-logs",
 | 
				
			||||||
                    "containerPort": 80
 | 
					                    "containerPath": "/mattermost/logs"
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            ],
 | 
					            ],
 | 
				
			||||||
            "links": [
 | 
					            "links": [
 | 
				
			||||||
@ -46,14 +79,27 @@
 | 
				
			|||||||
            ]
 | 
					            ]
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "name": "db",
 | 
					            "name": "web",
 | 
				
			||||||
            "image": "mattermost/mattermost-prod-db:latest",
 | 
					            "image": "mattermost/mattermost-prod-web:latest",
 | 
				
			||||||
            "memory": 128,
 | 
					            "memory": 128,
 | 
				
			||||||
            "mountPoints": [
 | 
					            "mountPoints": [
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    "sourceVolume": "db-data",
 | 
					                    "sourceVolume": "web-cert",
 | 
				
			||||||
                    "containerPath": "/var/lib/postgresql/data"
 | 
					                    "containerPath": "/cert"
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					            ],
 | 
				
			||||||
 | 
					            "portMappings": [
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    "hostPort": 80,
 | 
				
			||||||
 | 
					                    "containerPort": 80
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    "hostPort": 443,
 | 
				
			||||||
 | 
					                    "containerPort": 443
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            ],
 | 
				
			||||||
 | 
					            "links": [
 | 
				
			||||||
 | 
					                "app"
 | 
				
			||||||
            ]
 | 
					            ]
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user