Merge ~barryprice/charm-k8s-mattermost/+git/charm-k8s-mattermost:master into charm-k8s-mattermost:master

Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: 490102b7bef002f3d85c9fe35a55a686ed5bf5c1
Merged at revision: e4b44c2379244048348fddbb4d6cfc706157efd9
Proposed branch: ~barryprice/charm-k8s-mattermost/+git/charm-k8s-mattermost:master
Merge into: charm-k8s-mattermost:master
Diff against target: 21 lines (+2/-2)
1 file modified
Dockerfile (+2/-2)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Mattermost Charmers Pending
Review via email: mp+396977@code.launchpad.net

Commit message

Build v5.31.0 by default, clarify why xmlsec1 may be needed

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Stuart Bishop (stub) wrote :

Yup

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision e4b44c2379244048348fddbb4d6cfc706157efd9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 0132752..6bf5c48 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -7,14 +7,14 @@ ARG edition=enterprise
6 ARG image_flavour=default
7 ARG mattermost_gid=2000
8 ARG mattermost_uid=2000
9-ARG mattermost_version=5.27.0
10+ARG mattermost_version=5.31.0
11 ARG mattermost_webapp=mattermost-webapp.tar.gz
12
13 LABEL org.label-schema.version=${mattermost_version}
14 LABEL com.canonical.image-flavour=${image_flavour}
15 LABEL com.canonical.mattermost-edition=${edition}
16
17-# python3-yaml needed to run juju actions.
18+# python3-yaml needed to run juju actions, xmlsec1 needed if UseNewSAMLLibrary is set to false (the default)
19 RUN apt-get -qy update && \
20 apt-get -qy dist-upgrade && \
21 apt-get -qy install curl python3-yaml xmlsec1 && \

Subscribers

People subscribed via source and target branches