charm-k8s-bind

Merge ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master into charm-k8s-bind:master

  1. Git
  2. lp:~barryprice/charm-k8s-bind/+git/charm-k8s-bind
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Tom Haddon
Approved revision: 78419c1bcb4cc4797e029557249f9181e1eaf949
Merged at revision: 5a71c016c84798f99835d842213667659e9585d9
Proposed branch: ~barryprice/charm-k8s-bind/+git/charm-k8s-bind:master
Merge into: charm-k8s-bind:master
Diff against target: 29 lines (+4/-4)
2 files modified
Makefile (+2/-2)
dockerfile (+2/-2)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+393098@code.launchpad.net

Commit message

Correct paths for image-lint target

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
Tom Haddon (mthaddon) wrote :

LGTM

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

Change successfully merged at revision 5a71c016c84798f99835d842213667659e9585d9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 6577169..6e99731 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -30,8 +30,8 @@ image-deps:
6
7 image-lint: image-deps
8 @echo "Running shellcheck."
9- @shellcheck files/docker-entrypoint.sh
10- @shellcheck files/dns-check.sh
11+ @shellcheck image-scripts/docker-entrypoint.sh
12+ @shellcheck image-scripts/dns-check.sh
13
14 image-build: image-lint
15 @echo "Building the image."
16diff --git a/dockerfile b/dockerfile
17index e4922e0..00ff6e9 100644
18--- a/dockerfile
19+++ b/dockerfile
20@@ -21,8 +21,8 @@ RUN apt-get update && apt-get -y dist-upgrade \
21
22 # entrypoint script will configure Bind based on env variables
23 # dns-check script will provide a readinessProbe
24-COPY ./files/docker-entrypoint.sh /usr/local/bin/
25-COPY ./files/dns-check.sh /usr/local/bin/
26+COPY ./image-scripts/docker-entrypoint.sh /usr/local/bin/
27+COPY ./image-scripts/dns-check.sh /usr/local/bin/
28 RUN chmod 0755 /usr/local/bin/docker-entrypoint.sh
29 RUN chmod 0755 /usr/local/bin/dns-check.sh
30

Subscribers

People subscribed via source and target branches

to all changes: