Merge ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:upgrade-5.32.1 into charm-k8s-mattermost:master

Proposed by Paul Collins
Status: Merged
Approved by: Paul Collins
Approved revision: da4347c0dc84b3f4b9c1006bc8f5e4fd3834d8e1
Merged at revision: 246ec0796c6270cb9a891a97ef1b2c5502f41b15
Proposed branch: ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:upgrade-5.32.1
Merge into: charm-k8s-mattermost:master
Diff against target: 34 lines (+4/-4)
1 file modified
Dockerfile (+4/-4)
Reviewer Review Type Date Requested Status
Thomas Cuthbert Approve
Canonical IS Reviewers Pending
Review via email: mp+398313@code.launchpad.net

Commit message

upgrade to 5.32.1

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
Thomas Cuthbert (tcuthbert) wrote :

LGTM +1

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

Change successfully merged at revision 246ec0796c6270cb9a891a97ef1b2c5502f41b15

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index bf945df..f348041 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -7,7 +7,7 @@ ARG edition=enterprise
6 ARG image_flavour=default
7 ARG mattermost_gid=2000
8 ARG mattermost_uid=2000
9-ARG mattermost_version=5.31.0
10+ARG mattermost_version=5.32.1
11 ARG mattermost_webapp=mattermost-webapp.tar.gz
12
13 LABEL org.label-schema.version=${mattermost_version}
14@@ -39,17 +39,17 @@ RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins &&
15
16 # Enable prepackaged plugin
17 RUN if [ "$image_flavour" = canonical ]; then \
18- tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.1.2-linux-amd64.tar.gz ; \
19+ tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.2.1-linux-amd64.tar.gz ; \
20 fi
21
22 # Enable prepackaged plugin
23 RUN if [ "$image_flavour" = canonical ]; then \
24- tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v0.14.0-linux-amd64.tar.gz ; \
25+ tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v2.0.0-linux-amd64.tar.gz ; \
26 fi
27
28 # Enable prepackaged plugin
29 RUN if [ "$image_flavour" = canonical ]; then \
30- tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.1.0-linux-amd64.tar.gz ; \
31+ tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.3.0-linux-amd64.tar.gz ; \
32 fi
33
34 # Download and enable third-party plugin

Subscribers

People subscribed via source and target branches