Merge ~mthaddon/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:juju-action into ~mattermost-charmers/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:master

Proposed by Tom Haddon
Status: Merged
Approved by: Benjamin Allot
Approved revision: 541e524bf8a7bdf0727efec3e736d6a80d2f7094
Merged at revision: 6c2a9234db29abc5a2470030b08ba141622153f4
Proposed branch: ~mthaddon/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:juju-action
Merge into: ~mattermost-charmers/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:master
Diff against target: 16 lines (+2/-1)
1 file modified
Dockerfile (+2/-1)
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Canonical IS Reviewers Pending
Review via email: mp+395723@code.launchpad.net

Commit message

Add python3-yaml to default image as it's needed for juju actions

Description of the change

Add python3-yaml to default image as it's needed for juju actions

To post a comment you must log in.
Revision history for this message
Benjamin Allot (ballot) wrote :

LGTM

review: Approve
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 :

Change successfully merged at revision 6c2a9234db29abc5a2470030b08ba141622153f4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index f4afe50..823c564 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -14,9 +14,10 @@ LABEL org.label-schema.version=${mattermost_version}
6 LABEL com.canonical.image-flavour=${image_flavour}
7 LABEL com.canonical.mattermost-edition=${edition}
8
9+# python3-yaml needed to run juju actions.
10 RUN apt-get -qy update && \
11 apt-get -qy dist-upgrade && \
12- apt-get -qy install curl xmlsec1 && \
13+ apt-get -qy install curl python3-yaml xmlsec1 && \
14 rm -f /var/lib/apt/lists/*_*
15
16 RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins && \

Subscribers

People subscribed via source and target branches