Bump version to 5.31.3.

README.md

@@ -1,12 +1,6 @@
 # Production Docker deployment for Mattermost
 
-## WARNING:
-
-The current state of this repository doesn't work out-of-the box since Mattermost server v5.31+ requires PostgreSQL versions of 10 or higher.
-
-We're actively working on a fix to this repository. Until then, please refer to these upgrade instructions: https://github.com/mattermost/mattermost-docker/issues/489#issuecomment-790277661
-
-This project enables a deployment of a Mattermost server in a multi-node production configuration using Docker.
+This project enables deployment of a Mattermost server in a multi-node production configuration using Docker.
 
 [![Build Status](https://travis-ci.org/mattermost/mattermost-docker.svg?branch=master)](https://travis-ci.org/mattermost/mattermost-docker)
 

app/Dockerfile

@@ -2,6 +2,7 @@ FROM alpine:3.10
 
 # Some ENV variables
 ENV PATH="/mattermost/bin:${PATH}"
+ENV MM_VERSION=5.31.3
 ENV MM_INSTALL_TYPE=docker
 
 # Build argument to set Mattermost edition
@@ -9,7 +10,6 @@ ARG edition=enterprise
 ARG PUID=2000
 ARG PGID=2000
 ARG MM_BINARY=
-ARG MM_VERSION=5.31.0
 
 
 # Install some needed packages

docker-compose.yml

@@ -27,7 +27,6 @@ services:
       #   - edition=team
       #   - PUID=1000
       #   - PGID=1000
-      #   - MM_VERSION=5.31
     restart: unless-stopped
     volumes:
       - ./volumes/app/mattermost/config:/mattermost/config:rw
@@ -55,13 +54,11 @@ services:
   web:
     build: web
     ports:
-      - "80:8080"
-      - "443:8443"
+      - "80:80"
+      - "443:443"
     read_only: true
     restart: unless-stopped
     volumes:
       # This directory must have cert files if you want to enable SSL
       - ./volumes/web/cert:/cert:ro
       - /etc/localtime:/etc/localtime:ro
-    cap_drop:
-      - ALL

web/Dockerfile

@@ -1,38 +1,17 @@
-FROM nginxinc/nginx-unprivileged:mainline-alpine
-
-USER root
+FROM nginx:mainline-alpine
 
 # Remove default configuration and add our custom Nginx configuration files
 RUN rm /etc/nginx/conf.d/default.conf \
     && apk add --no-cache curl
 
 COPY ["./mattermost", "./mattermost-ssl", "/etc/nginx/sites-available/"]
+COPY ./security.conf /etc/nginx/conf.d/
 
 # Add and setup entrypoint
 COPY entrypoint.sh /
 
-RUN chown -R nginx:nginx /etc/nginx/sites-available && \
-         chown -R nginx:nginx /var/cache/nginx && \
-         chown -R nginx:nginx /var/log/nginx && \
-         chown -R nginx:nginx /etc/nginx/conf.d && \
-         chown nginx:nginx entrypoint.sh
-RUN touch /var/run/nginx.pid && \
-         chown -R nginx:nginx /var/run/nginx.pid
-
-COPY ./security.conf /etc/nginx/conf.d/
-
-RUN chown -R nginx:nginx /etc/nginx/conf.d/security.conf
-
-RUN chmod u+x /entrypoint.sh
-
-RUN sed -i "/^http {/a \    proxy_buffering off;\n" /etc/nginx/nginx.conf
-RUN sed -i '/temp_path/d' /etc/nginx/nginx.conf \
-    && sed -i 's!/tmp/nginx.pid!/var/run/nginx.pid!g' /etc/nginx/nginx.conf
-
-USER nginx
-
 #Healthcheck to make sure container is ready
-HEALTHCHECK CMD curl --fail http://localhost:8080 || exit 1
+HEALTHCHECK CMD curl --fail http://localhost:80 || exit 1
 
 ENTRYPOINT ["/entrypoint.sh"]
 

web/mattermost

@@ -4,7 +4,7 @@ map $http_x_forwarded_proto $proxy_x_forwarded_proto {
 }
 
 server {
-    listen 8080;
+    listen 80;
 
     location ~ /api/v[0-9]+/(users/)?websocket$ {
         proxy_set_header Upgrade $http_upgrade;

web/mattermost-ssl

@@ -1,5 +1,5 @@
 server {
-    listen 8080 default_server;
+    listen 80 default_server;
     server_name _;
     return 301 https://$host$request_uri;
 }
@@ -10,7 +10,7 @@ map $http_x_forwarded_proto $proxy_x_forwarded_proto {
 }
 
 server {
-    listen 8443 ssl http2;
+    listen 443 ssl http2;
 
     ssl_certificate /cert/cert.pem;
     ssl_certificate_key /cert/key-no-password.pem;