Merge ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:action-image into charm-k8s-unifi-poller:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 3c64caedc9d4f6ff59c227e0c868c662d46826e6
Merged at revision: 5912f1b0d0eb9f8b310c932e46ff3d87b22ed8ad
Proposed branch: ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:action-image
Merge into: charm-k8s-unifi-poller:master
Diff against target: 17 lines (+6/-0)
1 file modified
Dockerfile (+6/-0)
Reviewer Review Type Date Requested Status
Gareth Woolridge Approve
Canonical IS Reviewers Pending
Review via email: mp+396252@code.launchpad.net

Commit message

Add python3-yaml as needed for Juju actions

Description of the change

Add python3-yaml as needed for Juju actions

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
Gareth Woolridge (moon127) wrote :

LGTM

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

Change successfully merged at revision 5912f1b0d0eb9f8b310c932e46ff3d87b22ed8ad

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Dockerfile b/Dockerfile
index dea6e19..726579b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,12 @@ ARG BUILD_DATE
25LABEL org.label-schema.build-date=${BUILD_DATE}25LABEL org.label-schema.build-date=${BUILD_DATE}
26LABEL maintainer="unifi-poller-charmers@lists.launchpad.net"26LABEL maintainer="unifi-poller-charmers@lists.launchpad.net"
2727
28# Manually adding python3-yaml to the package list as it's needed for Juju
29# actions.
30RUN apt-get -qy update && \
31 apt-get -qy dist-upgrade && \
32 DEBIAN_FRONTEND="noninteractive" apt-get -qy install python3-yaml
33
28RUN mkdir -p /etc/unifi-poller34RUN mkdir -p /etc/unifi-poller
29COPY --from=builder unifi-poller/unifi-poller /35COPY --from=builder unifi-poller/unifi-poller /
30COPY --from=builder unifi-poller/examples/up.conf.example /etc/unifi-poller/up.conf36COPY --from=builder unifi-poller/examples/up.conf.example /etc/unifi-poller/up.conf

Subscribers

People subscribed via source and target branches