charm-k8s-discourse

Merge ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:oci-build-version into charm-k8s-discourse:master

  1. Git
  2. lp:~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse
  3. oci-build-version
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 79c6126c63e88ef3caa89d07f4996a9ba38907b9
Merged at revision: 76fc8e9c120d55e9f9236378edce238055917095
Proposed branch: ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:oci-build-version
Merge into: charm-k8s-discourse:master
Diff against target: 14 lines (+3/-0)
1 file modified
image/Dockerfile (+3/-0)
Reviewer Review Type Date Requested Status
Gareth Woolridge Approve
Canonical IS Reviewers Pending
Review via email: mp+394799@code.launchpad.net

Commit message

Add version label to docker image for OCI recipe build tagging

Description of the change

Add version label to docker image for OCI recipe build tagging

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 76fc8e9c120d55e9f9236378edce238055917095

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/image/Dockerfile b/image/Dockerfile
2index d314bb7..6f84b22 100644
3--- a/image/Dockerfile
4+++ b/image/Dockerfile
5@@ -14,6 +14,9 @@ ARG CONTAINER_APP_UID
6 ARG CONTAINER_APP_GROUP
7 ARG CONTAINER_APP_GID
8
9+# Used in Launchpad OCI Recipe build to tag the image.
10+LABEL org.label-schema.version=${CONTAINER_APP_VERSION:-v2.5.2}
11+
12 # Copy any args we got into the environment.
13 ENV CONTAINER_APP_NAME ${CONTAINER_APP_NAME:-discourse}
14 ENV CONTAINER_APP_VERSION ${CONTAINER_APP_VERSION:-v2.5.2}

Subscribers

People subscribed via source and target branches