Merge ~pjdc/charm-k8s-mattermost/+git/image-build:add-giphy-plugin into ~mattermost-charmers/charm-k8s-mattermost/+git/image-build:master

Proposed by Paul Collins
Status: Merged
Approved by: Paul Collins
Approved revision: 368e385fb65428318052fbfe2417c3553d97bb6d
Merged at revision: 224549bb2ac4af71a5a8f59b11ac6676407e4582
Proposed branch: ~pjdc/charm-k8s-mattermost/+git/image-build:add-giphy-plugin
Merge into: ~mattermost-charmers/charm-k8s-mattermost/+git/image-build:master
Diff against target: 20 lines (+3/-0)
2 files modified
.gitignore (+1/-0)
Dockerfile (+2/-0)
Reviewer Review Type Date Requested Status
Alexandre Gomes Approve
Review via email: mp+385443@code.launchpad.net

Commit message

add giphy plugin

To post a comment you must log in.
Revision history for this message
Alexandre Gomes (alejdg) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2new file mode 100644
3index 0000000..b25c15b
4--- /dev/null
5+++ b/.gitignore
6@@ -0,0 +1 @@
7+*~
8diff --git a/Dockerfile b/Dockerfile
9index 8fbc8e2..659ac01 100644
10--- a/Dockerfile
11+++ b/Dockerfile
12@@ -23,6 +23,8 @@ RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins &&
13 addgroup --gid ${PGID} mattermost && \
14 adduser --no-create-home --disabled-password --gecos "" --uid ${PUID} --gid ${PGID} --home /mattermost mattermost
15
16+RUN cd /mattermost/plugins && 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
17+
18 HEALTHCHECK CMD curl --fail http://localhost:8065 || exit 1
19
20 CMD ["/mattermost/bin/mattermost"]

Subscribers

People subscribed via source and target branches