Add bom.json and dependencies.txt to CPI CRS air-gapped container ima…

…ge (#234) Updated Makefile to auto populate version, registry, git-sha values in the template copies of bom.json and dependencies.txt and add them to the cpi-crs-airgapped image. ---- Signed-off-by: Aritra Sen <[email protected]> Co-authored-by: Aritra Sen <[email protected]>
vmware · Mar 10, 2023 · 4b0f350 · 4b0f350
1 parent 953b7aa
commit 4b0f350
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -9,12 +9,16 @@ REGISTRY?="harbor-repo.vmware.com/vcloud"
 
 crs-artifacts-prod:
 	sed -e "s/\.__GIT_COMMIT__//g" -e "s/__VERSION__/$(version)/g" artifacts/default-cloud-director-ccm-crs-airgap.yaml.template > artifacts/cloud-director-ccm-crs-airgap.yaml.template
+	sed -e "s/\.__GIT_COMMIT__//g" -e "s/__VERSION__/$(version)/g" -e "s~__REGISTRY__~$(REGISTRY)~g" artifacts/dependencies.txt.template > artifacts/dependencies.txt
+	sed -e "s/\.__GIT_COMMIT__//g" -e "s/__VERSION__/$(version)/g" -e "s~__REGISTRY__~$(REGISTRY)~g" artifacts/bom.json.template > artifacts/bom.json
 	docker build -f ./artifacts/Dockerfile . -t cpi-crs-airgapped:$(version)
 	docker tag cpi-crs-airgapped:$(version) $(REGISTRY)/cpi-crs-airgapped:$(version)
 	docker push $(REGISTRY)/cpi-crs-airgapped:$(version)
 
 crs-artifacts-dev:
 	sed -e "s/__GIT_COMMIT__/$(GITCOMMIT)/g" -e "s/__VERSION__/$(version)/g" artifacts/default-cloud-director-ccm-crs-airgap.yaml.template > artifacts/cloud-director-ccm-crs-airgap.yaml.template
+	sed -e "s/__GIT_COMMIT__/$(GITCOMMIT)/g" -e "s/__VERSION__/$(version)/g" -e "s~__REGISTRY__~$(REGISTRY)~g" artifacts/dependencies.txt.template > artifacts/dependencies.txt
+	sed -e "s/__GIT_COMMIT__/$(GITCOMMIT)/g" -e "s/__VERSION__/$(version)/g" -e "s~__REGISTRY__~$(REGISTRY)~g" artifacts/bom.json.template > artifacts/bom.json
 	docker build -f ./artifacts/Dockerfile . -t cpi-crs-airgapped:$(GITCOMMIT)
 	docker tag cpi-crs-airgapped:$(GITCOMMIT) $(REGISTRY)/cpi-crs-airgapped:$(GITCOMMIT)
 	docker push $(REGISTRY)/cpi-crs-airgapped:$(GITCOMMIT)

diff --git a/artifacts/Dockerfile b/artifacts/Dockerfile
@@ -1,3 +1,5 @@
 FROM scratch
-COPY /artifacts/cloud-director-ccm-crs-airgap.yaml.template /src/artifact/
-ENTRYPOINT ["/bin/sh"]
+COPY ./artifacts/cloud-director-ccm-crs-airgap.yaml.template \
+	./artifacts/dependencies.txt \
+	./artifacts/bom.json /src/artifact/
+ENTRYPOINT ["/bin/sh"]
diff --git a/artifacts/bom.json.template b/artifacts/bom.json.template
@@ -0,0 +1,20 @@
+{
+	"name":"cpi-crs-airgapped",
+	"version":"__VERSION__.__GIT_COMMIT__",
+	"components": {
+		"manifests":[
+			{
+				"name": "cloud-director-ccm-crs-airgap.yaml.template",
+				"url": ""
+			}
+		],
+		"binaries": [],
+		"dependencies": [
+			{
+				"name":"cloud-provider-for-cloud-director",
+				"version":"__VERSION__.__GIT_COMMIT__",
+				"imageRepository":"__REGISTRY__"
+			}
+		]
+	}
+}
diff --git a/artifacts/dependencies.txt.template b/artifacts/dependencies.txt.template
@@ -0,0 +1 @@
+__REGISTRY__ cloud-provider-for-cloud-director __VERSION__.__GIT_COMMIT__
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		__REGISTRY__ cloud-provider-for-cloud-director __VERSION__.__GIT_COMMIT__