Merge remote-tracking branch 'upstream/master'

* upstream/master: (21 commits) bump to 5.11.0 (mattermost#393) fix typo in readme (mattermost#391) Revert "update readme to add deprecation notice (mattermost#388)" (mattermost#389) include timezone for plugins that use location information. (mattermost#390) update readme to add deprecation notice (mattermost#388) update to 5.10.0 bump to use 5.9.0 bump to 5.8.1 Upgrade app alpine image to 3.9 Add Carlos Panato as maintainer Move Pan Luo as previous maintainer update MM to 5.8.0 update MM to 5.7.2 Enable error log to Console by default Upgrade to 5.7.1 (mattermost#358) Update docker-stack-traefik.yml update to 5.7.0 bump to 5.6.3 Add client plugins as bind mount add config ...
Lets-Talk-NL · May 28, 2019 · 0b5f1bc · 0b5f1bc
2 parents 484f7ed + 548091e
commit 0b5f1bc
Show file tree

Hide file tree

Showing 12 changed files with 452 additions and 15 deletions.
diff --git a/MAINTENANCE.md b/MAINTENANCE.md
@@ -16,10 +16,10 @@ Please use this long name:
 
 The following people help to maintain this open source project:
 
-| Current Maintainer(s)  | Start Date    |
-|:-----------------------|:--------------|
-| Pan Luo - @xcompass    | Nov 30 2015   |
-| Kyâne Pichou - @pichouk| Jun 01 2017   |
+| Current Maintainer(s)                 | Start Date    |
+|:--------------------------------------|:--------------|
+| Kyâne Pichou - @pichouk               | Jun 01 2017   |
+| Carlos Tadeu Panato Junior - @cpanato | Feb 18 2018   |
 
 In case something happens where no maintainers are able to complete their responsibilies, the following sponsoring organization can help find a new maintainer:
 
@@ -59,6 +59,7 @@ PREVIOUS MAINTAINERS
 | Maintainer             | Start Date    | End Date    |
 |:-----------------------|:--------------|:------------|
 | Yi EungJun - @npcode   | Nov 26 2015   | Nov 30 2016 |
+| Pan Luo - @xcompass    | Nov 30 2015   | Feb 21 2019 |
 
 
 CREATOR

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ The following instructions deploy Mattermost in a production configuration using
 
 If you want to install Enterprise Edition, you can skip this section.
 
-To install the team edition, comment out the two following lines in docker-compose.yaml file:
+To install the team edition, uncomment out these lines in docker-compose.yaml file:
 ```yaml
 args:
   - edition=team

diff --git a/app/Dockerfile b/app/Dockerfile
@@ -1,8 +1,8 @@
-FROM alpine:3.7
+FROM alpine:3.9
 
 # Some ENV variables
 ENV PATH="/mattermost/bin:${PATH}"
-ENV MM_VERSION=5.6.1
+ENV MM_VERSION=5.11.0
 
 # Build argument to set Mattermost edition
 ARG edition=enterprise
@@ -22,6 +22,7 @@ RUN apk add --no-cache \
 	mailcap \
 	netcat-openbsd \
 	xmlsec-dev \
+	tzdata \
 	&& rm -rf /tmp/*
 
 # Get Mattermost

diff --git a/app/entrypoint.sh b/app/entrypoint.sh
@@ -34,8 +34,8 @@ if [ "$1" = 'mattermost' ]; then
     cp /config.json.save $MM_CONFIG
     # Substitue some parameters with jq
     jq '.ServiceSettings.ListenAddress = ":8000"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
-    jq '.LogSettings.EnableConsole = false' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
-    jq '.LogSettings.ConsoleLevel = "INFO"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
+    jq '.LogSettings.EnableConsole = true' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
+    jq '.LogSettings.ConsoleLevel = "ERROR"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.FileSettings.Directory = "/mattermost/data/"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.FileSettings.EnablePublicLink = true' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.FileSettings.PublicLinkSalt = "'$(generate_salt)'"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG

diff --git a/contrib/aws/.gitignore b/contrib/aws/.gitignore
@@ -0,0 +1,5 @@
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
diff --git a/contrib/aws/Dockerrun.aws.json b/contrib/aws/Dockerrun.aws.json
@@ -43,6 +43,7 @@
             "name": "db",
             "image": "mattermost/mattermost-prod-db:latest",
             "memory": 128,
+            "essential": true,
             "mountPoints": [
                 {
                     "sourceVolume": "db-data",
@@ -66,6 +67,7 @@
             "name": "app",
             "image": "mattermost/mattermost-prod-app:latest",
             "memory": 128,
+            "essential": true,
             "mountPoints": [
                 {
                     "sourceVolume": "app-config",
@@ -90,8 +92,9 @@
         },
         {
             "name": "web",
-            "image": "mattermost/mattermost-prod-web:latest",
+            "image": "mattermost/mattermost-prod-web:5.9.0",
             "memory": 128,
+            "essential": true,
             "mountPoints": [
                 {
                     "sourceVolume": "web-cert",

diff --git a/contrib/aws/README.md b/contrib/aws/README.md
@@ -6,6 +6,8 @@
 
 ### Install
 
+Make the changes in the config file to reflect your needs (app/mattermost/config/config.json)
+
 ```
 eb init
 eb create prod
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ @@
     ### Install
+    Make the changes in the config file to reflect your needs (app/mattermost/config/config.json)
     ```
     eb init
     eb create prod
@@ Expand Down @@