From 99d9db009c387babf4c2dcd9ee1b9964eea84f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PICHOU=20Ky=C3=A2ne?= <kyane.pichou@etu.utc.fr>
Date: Mon, 17 Apr 2017 11:38:00 +0200
Subject: [PATCH] Update mattermost sub repository
---
mattermost/.travis.yml | 2 +-
mattermost/app/Dockerfile | 2 +-
mattermost/app/Dockerfile-enterprise | 2 +-
mattermost/docker-compose.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mattermost/.travis.yml b/mattermost/.travis.yml
index e974eab6..bdd6e6c8 100644
--- a/mattermost/.travis.yml
+++ b/mattermost/.travis.yml
@@ -9,7 +9,7 @@ before_install:
install:
- eval $BUILD
- - sleep 10
+ - sleep 30
env:
- BUILD="docker-compose up -d"
diff --git a/mattermost/app/Dockerfile b/mattermost/app/Dockerfile
index 51c8cc39..2baa52a9 100644
--- a/mattermost/app/Dockerfile
+++ b/mattermost/app/Dockerfile
@@ -5,7 +5,7 @@ ENV PATH="/mattermost/bin:${PATH}"
RUN apt-get update && apt-get -y install curl netcat
RUN mkdir -p /mattermost/data
-ENV MM_VERSION=3.7.2
+ENV MM_VERSION=3.8.0
RUN curl https://releases.mattermost.com/$MM_VERSION/mattermost-team-$MM_VERSION-linux-amd64.tar.gz | tar -xvz
diff --git a/mattermost/app/Dockerfile-enterprise b/mattermost/app/Dockerfile-enterprise
index b52e046e..2a4753b3 100644
--- a/mattermost/app/Dockerfile-enterprise
+++ b/mattermost/app/Dockerfile-enterprise
@@ -5,7 +5,7 @@ ENV PATH="/mattermost/bin:${PATH}"
RUN apt-get update && apt-get -y install curl netcat
RUN mkdir -p /mattermost/data
-ENV MM_VERSION=3.7.1
+ENV MM_VERSION=3.8.0
RUN curl https://releases.mattermost.com/$MM_VERSION/mattermost-$MM_VERSION-linux-amd64.tar.gz | tar -xvz
diff --git a/mattermost/docker-compose.yml b/mattermost/docker-compose.yml
index 5d1622cd..a4e57e09 100644
--- a/mattermost/docker-compose.yml
+++ b/mattermost/docker-compose.yml
@@ -24,7 +24,7 @@ services:
build:
context: app
# comment out for team edition
- dockerfile: Dockerfile-enterprise
+ #dockerfile: Dockerfile-entreprise
restart: unless-stopped
volumes:
- ./volumes/app/mattermost/config:/mattermost/config:rw
--
GitLab