Merge pull request #649 from cloudfoundry/177481547-oci-image-labels-…

…capi-nginx-kbld

Added OCI labels to capi nginx kbld config

images/build/capi/generate-kbld-config.sh

@@ -20,7 +20,8 @@ function generate_kbld_config() {
   kbld_config_values=$(cat <<EOF
 #@data/values
 ---
-git_sha: ${git_sha}
+git_ref: ${git_sha}
+git_url: https://github.com/cloudfoundry/capi-k8s-release.git
 EOF
 )
 

images/build/capi/kbld.yml

@@ -13,7 +13,7 @@ sources:
         - gcr.io/paketo-buildpacks/go
       rawOptions:
       - --env
-      - #@ "BP_OCI_REVISION=" + data.values.git_sha
+      - #@ "BP_OCI_REVISION=" + data.values.git_ref
       - --env
       - "BP_OCI_SOURCE=https://github.com/cloudfoundry/capi-k8s-release"
 - imageRepo: cloudfoundry/cf-api-backup-metadata-generator
@@ -28,7 +28,7 @@ sources:
       - "--default-process"
       - "wait"
       - --env
-      - #@ "BP_OCI_REVISION=" + data.values.git_sha
+      - #@ "BP_OCI_REVISION=" + data.values.git_ref
       - --env
       - "BP_OCI_SOURCE=https://github.com/cloudfoundry/capi-k8s-release"
 - imageRepo: cloudfoundry/cf-api-package-registry-buddy
@@ -40,12 +40,18 @@ sources:
         - gcr.io/paketo-buildpacks/go
       rawOptions:
       - --env
-      - #@ "BP_OCI_REVISION=" + data.values.git_sha
+      - #@ "BP_OCI_REVISION=" + data.values.git_ref
       - --env
       - "BP_OCI_SOURCE=https://github.com/cloudfoundry/capi-k8s-release"
 - imageRepo: cloudfoundry/capi-nginx
   path: sources/capi-k8s-release/dockerfiles/nginx
-  docker: {}
+  docker:
+    build:
+      rawOptions:
+        - --label
+        - #@ "org.opencontainers.image.source={}".format(data.values.git_url)
+        - --label
+        - #@ "org.opencontainers.image.revision={}".format(data.values.git_ref)
 destinations:
   - imageRepo: cloudfoundry/cf-api-controllers
     newImage: index.docker.io/cloudfoundry/cf-api-controllers