Merge ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:default-build-date into charm-k8s-unifi-poller:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: bffe7275fbc4e3cdd64950040e72eab3f04c56ef
Merged at revision: 8bc2bc8ef6e295d6d37d9c81ca1d779b7f5d79dd
Proposed branch: ~mthaddon/charm-k8s-unifi-poller/+git/charm-k8s-unifi-poller:default-build-date
Merge into: charm-k8s-unifi-poller:master
Diff against target: 30 lines (+10/-1)
2 files modified
Makefile (+9/-0)
config.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Gareth Woolridge Approve
Canonical IS Reviewers Pending
Review via email: mp+392934@code.launchpad.net

Commit message

Add a note referencing the OCI image build on Launchpad

Description of the change

Add a note referencing the OCI image build on Launchpad

To post a comment you must log in.
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 :

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 8bc2bc8ef6e295d6d37d9c81ca1d779b7f5d79dd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index e52c1e1..2d203ad 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,3 +1,12 @@
6+#############################################################################
7+# The docker image for this charm is built on Launchpad using an OCI Recipe:
8+# https://launchpad.net/~unifi-poller-charmers/charm-k8s-unifi-poller/+oci/unifi-poller/+recipe/unifi-poller
9+# From here, they're then pushed to:
10+# https://registry.hub.docker.com/u/unifipollercharmers/unifipoller
11+# If you make any changes to variables passed to the image-build target,
12+# be sure to update the OCI Recipe as well - arguments there are currently
13+# hard-coded.
14+#############################################################################
15 DIST_RELEASE ?= focal
16 DOCKER_DEPS = golang git make
17 UNIFI_POLLER_VERSION ?= latest
18diff --git a/config.yaml b/config.yaml
19index e17157f..a7db31c 100644
20--- a/config.yaml
21+++ b/config.yaml
22@@ -8,7 +8,7 @@ options:
23 The location of the image to use, e.g. "registry.example.com/unifi-poller:v2.0.1".
24
25 This setting is required.
26- default: ''
27+ default: unifipollercharmers/unifipoller:edge
28 image_username:
29 type: string
30 description: |

Subscribers

People subscribed via source and target branches