Merge pull request #17 from mattermost/master

master merge

README.md

@@ -28,7 +28,7 @@ To install the team edition, comment out the two following lines in docker-compo
 args:
   - edition=team
 ```
-The `app` Dockerfile will read the `edition` build argument to install Team (`edition = 'team'`) or Entreprise (`edition != team`) edition.
+The `app` Dockerfile will read the `edition` build argument to install Team (`edition = 'team'`) or Enterprise (`edition != team`) edition.
 
 ### Database container
 This repository offer a Docker image for the Mattermost database. It is a customized PostgreSQL image that you should configure with following environment variables :
@@ -98,6 +98,8 @@ This image is optional, you should **not** use it when you have your own reverse
 * `APP_HOST`: application host address
 * `APP_PORT_NUMBER`: application HTTP port
 
+If you plan to upload large files to your Mattermost instance, Nginx will need to write some temporary files. In that case, the `read_only: true` option on the `web` container should be removed from your `docker-compose.yml` file.
+
 #### Install with SSL certificate
 Put your SSL certificate as `./volumes/web/cert/cert.pem` and the private key that has
 no password as `./volumes/web/cert/key-no-password.pem`. If you don't have

app/Dockerfile

@@ -8,6 +8,7 @@ ENV MM_VERSION=5.3.1
 ARG edition=team
 ARG PUID=2000
 ARG PGID=2000
+ARG MM_BINARY=
 
 # Install some needed packages
 RUN apk add --no-cache \
@@ -24,7 +25,8 @@ RUN apk add --no-cache \
 
 # Get Mattermost
 RUN mkdir -p /mattermost/data \
-    && if [ "$edition" = "team" ] ; then curl https://releases.mattermost.com/$MM_VERSION/mattermost-team-$MM_VERSION-linux-amd64.tar.gz | tar -xvz ; \
+    && if [ ! -z "$MM_BINARY" ]; then curl $MM_BINARY | tar -xvz ; \
+      elif [ "$edition" = "team" ] ; then curl https://releases.mattermost.com/$MM_VERSION/mattermost-team-$MM_VERSION-linux-amd64.tar.gz | tar -xvz ; \
       else curl https://releases.mattermost.com/$MM_VERSION/mattermost-$MM_VERSION-linux-amd64.tar.gz | tar -xvz ; fi \
     && cp /mattermost/config/config.json /config.json.save \
     && rm -rf /mattermost/config/config.json \
@@ -47,4 +49,4 @@ CMD ["mattermost"]
 EXPOSE 8000
 
 # Declare volumes for mount point directories
-VOLUME ["/mattermost/data", "/mattermost/logs", "/mattermost/config", "/mattermost/plugins"]
+VOLUME ["/mattermost/data", "/mattermost/logs", "/mattermost/config", "/mattermost/plugins", "/mattermost/client/plugins"]

app/entrypoint.sh

@@ -51,29 +51,22 @@ if [ "$1" = 'mattermost' ]; then
     jq '.SqlSettings.DriverName = "postgres"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.SqlSettings.AtRestEncryptKey = "'$(generate_salt)'"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.PluginSettings.Directory = "/mattermost/plugins/"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
-  else
-    echo "Using existing config file" $MM_CONFIG
-  fi
 
-  # Configure database access
-  if [ -z "$MM_SQLSETTINGS_DATASOURCE" ]
-  then
-    echo -ne "Configure database connection..."
-    # URLEncode the password, allowing for special characters
-    ENCODED_PASSWORD=$(printf %s $MM_PASSWORD | jq -s -R -r @uri)
-    export MM_SQLSETTINGS_DATASOURCE="postgres://$MM_USERNAME:$ENCODED_PASSWORD@$DB_HOST:$DB_PORT_NUMBER/$MM_DBNAME?sslmode=disable&connect_timeout=10"
-    echo OK
+    # Configure database access
+    if [[ -z "$MM_SQLSETTINGS_DATASOURCE" ]]
+    then
+      echo -ne "Configure database connection..."
+      # URLEncode the password, allowing for special characters
+      ENCODED_PASSWORD=$(printf %s $MM_PASSWORD | jq -s -R -r @uri)
+      export MM_SQLSETTINGS_DATASOURCE="postgres://$MM_USERNAME:$ENCODED_PASSWORD@$DB_HOST:$DB_PORT_NUMBER/$MM_DBNAME?sslmode=disable&connect_timeout=10"
+      echo OK
+    else
+      echo "Using existing database connection"
+    fi
   else
-    echo "Using existing database connection"
+    echo "Using existing config file" $MM_CONFIG
   fi
 
-  # Wait for database to be reachable
-  echo "Wait until database $DB_HOST:$DB_PORT_NUMBER is ready..."
-  until nc -z $DB_HOST $DB_PORT_NUMBER
-  do
-    sleep 1
-  done
-
   # Wait another second for the database to be properly started.
   # Necessary to avoid "panic: Failed to open sql connection pq: the database system is starting up"
   sleep 1

db/Dockerfile

@@ -19,7 +19,7 @@ RUN apk add --no-cache \
 COPY setup-wale.sh /docker-entrypoint-initdb.d/
 
 #Healthcheck to make sure container is ready
-HEALTHCHECK CMD pg_isready -U postgres || exit 1
+HEALTHCHECK CMD pg_isready || exit 1
 
 # Add and configure entrypoint and command
 COPY entrypoint.sh /