charm-k8s-jenkins-agent

Merge ~mthaddon/charm-k8s-jenkins-agent/+git/charm-k8s-jenkins-agent:label-version into charm-k8s-jenkins-agent:master

  1. Git
  2. lp:~mthaddon/charm-k8s-jenkins-agent/+git/charm-k8s-jenkins-agent
  3. label-version
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 3be52479a85f30c1387fe6b0fdaefa51c51a5cf6
Merged at revision: 8a4e587d81824e870569c0d6d8d6b0f60a83c5d0
Proposed branch: ~mthaddon/charm-k8s-jenkins-agent/+git/charm-k8s-jenkins-agent:label-version
Merge into: charm-k8s-jenkins-agent:master
Diff against target: 13 lines (+1/-1)
1 file modified
dockerfile/Dockerfile (+1/-1)
Reviewer Review Type Date Requested Status
Alexandre Gomes Approve
Canonical IS Reviewers Pending
Review via email: mp+388304@code.launchpad.net

Commit message

Fix Dockerfile to use dist-release-version label as appropriate lp#1888638

Description of the change

Fix Dockerfile to use dist-release-version label as appropriate lp#1888638

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
Alexandre Gomes (alejdg) wrote :

+1

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

Change successfully merged at revision 8a4e587d81824e870569c0d6d8d6b0f60a83c5d0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/dockerfile/Dockerfile b/dockerfile/Dockerfile
2index 52a1403..1abd7e6 100644
3--- a/dockerfile/Dockerfile
4+++ b/dockerfile/Dockerfile
5@@ -6,7 +6,7 @@ ENTRYPOINT /entrypoint.sh
6 ARG DIST_RELEASE_VERSION=20.04
7
8 LABEL com.canonical.dist-release=${DIST_RELEASE}
9-LABEL com.canonical.dist-release=${DIST_RELEASE_VERSION}
10+LABEL com.canonical.dist-release-version=${DIST_RELEASE_VERSION}
11
12 ARG AUTHOR
13 LABEL org.opencontainers.image.authors=${OCI_AUTHOR}

Subscribers

People subscribed via source and target branches