Merge ~pjdc/charm-k8s-mattermost/+git/image-build:plugins into ~mattermost-charmers/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:master

Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: e619392b9efff31c50a8c7eaf4112ff41a9cff3a
Merged at revision: d2222077f1c8f6e3b96a570e4d56af3ab7bae5ab
Proposed branch: ~pjdc/charm-k8s-mattermost/+git/image-build:plugins
Merge into: ~mattermost-charmers/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:master
Diff against target: 32 lines (+11/-0)
1 file modified
Dockerfile (+11/-0)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+386416@code.launchpad.net

Commit message

add plugins for LP:1883455, LP:1883766, LP:1884289; use bash for pipefail

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

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

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision d2222077f1c8f6e3b96a570e4d56af3ab7bae5ab

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 53f1d91..d91ae5f 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -1,5 +1,8 @@
6 FROM ubuntu:focal
7
8+# We use "set -o pipefail"
9+SHELL ["/bin/bash", "-c"]
10+
11 ENV MM_VERSION=5.23.1
12
13 # Build argument to set Mattermost edition
14@@ -31,10 +34,18 @@ RUN rm -rf /mattermost/client && \
15
16 RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.1.2-linux-amd64.tar.gz
17
18+RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v0.11.0-linux-amd64.tar.gz
19+
20+RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.0.1-linux-amd64.tar.gz
21+
22 RUN cd /mattermost/plugins && \
23 set -o pipefail && \
24 curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v1.2.1/com.github.moussetc.mattermost.plugin.giphy-1.2.1.tar.gz | tar -xvz
25
26+RUN cd /mattermost/plugins && \
27+ set -o pipefail && \
28+ 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
29+
30 HEALTHCHECK CMD curl --fail http://localhost:8065 || exit 1
31
32 CMD ["/mattermost/bin/mattermost"]

Subscribers

People subscribed via source and target branches