Compare commits
13 Commits
master
...
gnous-5.34
Author | SHA1 | Date | |
---|---|---|---|
03523de4a4 | |||
fe4aecd04f | |||
4794c59f59 | |||
a20d22168f | |||
9bbe9cb71a | |||
bb9c315f55 | |||
6ce22d0c6a | |||
4e3182df25 | |||
2db1b7d36b | |||
|
d8bfbfb2a3 | ||
|
3fbb1bc49d | ||
|
7e683c329a | ||
|
a0c8f65ec1 |
@ -2,11 +2,11 @@ FROM alpine:3.10
|
||||
|
||||
# Some ENV variables
|
||||
ENV PATH="/mattermost/bin:${PATH}"
|
||||
ENV MM_VERSION=5.31.0
|
||||
ENV MM_VERSION=5.34.2
|
||||
ENV MM_INSTALL_TYPE=docker
|
||||
|
||||
# Build argument to set Mattermost edition
|
||||
ARG edition=enterprise
|
||||
ARG edition=team
|
||||
ARG PUID=2000
|
||||
ARG PGID=2000
|
||||
ARG MM_BINARY=
|
||||
@ -25,6 +25,7 @@ RUN apk add --no-cache \
|
||||
netcat-openbsd \
|
||||
xmlsec-dev \
|
||||
tzdata \
|
||||
postgresql-client \
|
||||
&& rm -rf /tmp/*
|
||||
|
||||
# Get Mattermost
|
||||
|
@ -74,7 +74,11 @@ if [ "$1" = 'mattermost' ]; then
|
||||
|
||||
# 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
|
||||
until pg_isready -h $DB_HOST -p $DB_PORT_NUMBER
|
||||
do
|
||||
echo "Database is not ready yet. Waiting 5 seconds."
|
||||
sleep 5
|
||||
done
|
||||
|
||||
echo "Starting mattermost"
|
||||
fi
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM postgres:9.4-alpine
|
||||
FROM postgres:12.7-alpine
|
||||
|
||||
ENV DEFAULT_TIMEZONE UTC
|
||||
|
||||
@ -10,7 +10,7 @@ RUN apk add --no-cache \
|
||||
libc6-compat \
|
||||
libffi-dev \
|
||||
linux-headers \
|
||||
python-dev \
|
||||
python3-dev \
|
||||
py-pip \
|
||||
py-cryptography \
|
||||
pv \
|
||||
|
Reference in New Issue
Block a user