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
diff --git a/Dockerfile b/Dockerfile
index bf945df..f348041 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG edition=enterprise
7ARG image_flavour=default7ARG image_flavour=default
8ARG mattermost_gid=20008ARG mattermost_gid=2000
9ARG mattermost_uid=20009ARG mattermost_uid=2000
10ARG mattermost_version=5.31.010ARG mattermost_version=5.32.1
11ARG mattermost_webapp=mattermost-webapp.tar.gz11ARG mattermost_webapp=mattermost-webapp.tar.gz
1212
13LABEL org.label-schema.version=${mattermost_version}13LABEL org.label-schema.version=${mattermost_version}
@@ -39,17 +39,17 @@ RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins &&
3939
40# Enable prepackaged plugin40# Enable prepackaged plugin
41RUN if [ "$image_flavour" = canonical ]; then \41RUN if [ "$image_flavour" = canonical ]; then \
42 tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.1.2-linux-amd64.tar.gz ; \42 tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.2.1-linux-amd64.tar.gz ; \
43 fi43 fi
4444
45# Enable prepackaged plugin45# Enable prepackaged plugin
46RUN if [ "$image_flavour" = canonical ]; then \46RUN if [ "$image_flavour" = canonical ]; then \
47 tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v0.14.0-linux-amd64.tar.gz ; \47 tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v2.0.0-linux-amd64.tar.gz ; \
48 fi48 fi
4949
50# Enable prepackaged plugin50# Enable prepackaged plugin
51RUN if [ "$image_flavour" = canonical ]; then \51RUN if [ "$image_flavour" = canonical ]; then \
52 tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.1.0-linux-amd64.tar.gz ; \52 tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.3.0-linux-amd64.tar.gz ; \
53 fi53 fi
5454
55# Download and enable third-party plugin55# Download and enable third-party plugin

Subscribers

People subscribed via source and target branches