From 39e9023691cd46e0469a36d699d6aee5dc4feb18 Mon Sep 17 00:00:00 2001
From: Simon Staszkiewicz <sstaszkiewicz@copperleaf.com>
Date: Fri, 29 Nov 2019 15:25:20 +0000
Subject: [PATCH] Bug fixes (#427)

* Call the base container entrypoint with proper arguments

* Build the app container using path to directory

* Add CONTRIBUTING.md
---
 CONTRIBUTING.md    | 5 +++++
 db/entrypoint.sh   | 2 +-
 docker-compose.yml | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100755 CONTRIBUTING.md
 mode change 100644 => 100755 docker-compose.yml

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100755
index 0000000..4b61478
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,5 @@
+# Code Contribution Guidelines
+
+Thank you for your interest in contributing! Please see the [Mattermost Contribution Guide](https://developers.mattermost.com/contribute/getting-started/) which describes the process for making code contributions across Mattermost projects and [join our "Contributors" community channel](https://community.mattermost.com/core/channels/tickets) to ask questions from community members and the Mattermost core team.
+
+When you submit a pull request, it goes through a [code review process outlined here](https://developers.mattermost.com/contribute/getting-started/code-review/).
diff --git a/db/entrypoint.sh b/db/entrypoint.sh
index 5d4dd34..ce0facc 100755
--- a/db/entrypoint.sh
+++ b/db/entrypoint.sh
@@ -58,5 +58,5 @@ if [ "$1" = 'postgres' ]; then
   update_conf $wal_enable
 
   # Run the postgresql entrypoint
-  . /docker-entrypoint.sh
+  docker-entrypoint.sh postgres
 fi
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index eb593ad..e045a30
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,8 +20,7 @@ services:
     #  - AWS_REGION=us-east-1
 
   app:
-    build:
-      context: app
+    build: app
       # uncomment following lines for team edition or change UID/GID
       # args:
       #   - edition=team