Merge ~sajoupa/charm-k8s-mattermost:master into charm-k8s-mattermost:master

Proposed by Laurent Sesquès
Status: Merged
Approved by: Laurent Sesquès
Approved revision: 9ba24ed84d80fd4534444da836b5aa51c7040a94
Merged at revision: be8ed3d237d945e3849a3df095e2ca2ae77406b0
Proposed branch: ~sajoupa/charm-k8s-mattermost:master
Merge into: charm-k8s-mattermost:master
Diff against target: 45 lines (+5/-5)
1 file modified
Dockerfile (+5/-5)
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
🤖 prod-jenkaas-is (community) continuous-integration Needs Fixing
Canonical IS Reviewers Pending
Review via email: mp+409436@code.launchpad.net

Commit message

update mattermost to 5.39.0

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
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Benjamin Allot (ballot) wrote :

LGTM.

Having all the version of the plugin as variables would make such change easier IMO.

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

Change successfully merged at revision be8ed3d237d945e3849a3df095e2ca2ae77406b0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 4547dcf..ae831fd 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.33.3
10+ARG mattermost_version=5.39.0
11 ARG mattermost_webapp=mattermost-webapp.tar.gz
12
13 LABEL org.label-schema.version=${mattermost_version}
14@@ -39,12 +39,12 @@ 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.2.1-linux-amd64.tar.gz ; \
19+ tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.2.2-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-v2.0.0-linux-amd64.tar.gz ; \
25+ tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v2.0.1-linux-amd64.tar.gz ; \
26 fi
27
28 # Enable prepackaged plugin
29@@ -63,14 +63,14 @@ RUN if [ "$image_flavour" = canonical ]; then \
30 RUN if [ "$image_flavour" = canonical ]; then \
31 cd /mattermost/plugins && \
32 set -o pipefail && \
33- curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v2.0.0/com.github.moussetc.mattermost.plugin.giphy-2.0.0.tar.gz | tar -xvz ; \
34+ curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v2.1.0/com.github.moussetc.mattermost.plugin.giphy-2.1.0.tar.gz | tar -xvz ; \
35 fi
36
37 # Download and enable third-party plugin
38 RUN if [ "$image_flavour" = canonical ]; then \
39 cd /mattermost/plugins && \
40 set -o pipefail && \
41- curl -L https://github.com/scottleedavis/mattermost-plugin-remind/releases/download/0.4.4/com.github.scottleedavis.mattermost-plugin-remind-0.4.4.tar.gz | tar -xvz ; \
42+ curl -L https://github.com/scottleedavis/mattermost-plugin-remind/releases/download/v0.4.5/com.github.scottleedavis.mattermost-plugin-remind-0.4.5.tar.gz | tar -xvz ; \
43 fi
44
45 # Canonical's custom webapp

Subscribers

People subscribed via source and target branches