From 548063a115c465389e1cc3feeb65ffaba7164da7 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Sun, 22 Dec 2019 14:55:40 +0100
Subject: [PATCH] Bump alpine version
---
pica-mattermost/Dockerfile | 2 +-
pica-mattermost/entrypoint.sh | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pica-mattermost/Dockerfile b/pica-mattermost/Dockerfile
index ac8f1485..68a2d458 100644
--- a/pica-mattermost/Dockerfile
+++ b/pica-mattermost/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
# Some ENV variables
ENV PATH="/mattermost/bin:${PATH}"
diff --git a/pica-mattermost/entrypoint.sh b/pica-mattermost/entrypoint.sh
index 437e24ae..3e571675 100644
--- a/pica-mattermost/entrypoint.sh
+++ b/pica-mattermost/entrypoint.sh
@@ -1,5 +1,10 @@
#!/bin/sh
+# Function to generate a random salt
+generate_salt() {
+ tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 48 | head -n 1
+}
+
# Read environment variables or set default values
DB_HOST=${DB_HOST:-db}
DB_PORT_NUMBER=${DB_PORT_NUMBER:-5432}
--
GitLab