From 35762fb222cbfc2ded314cf5623aaf7928b4c8cb Mon Sep 17 00:00:00 2001
From: Laurent Goderre <laurent.goderre@docker.com>
Date: Thu, 7 Nov 2024 10:29:25 -0500
Subject: [PATCH] Migrate rest of images to new build and add sbom for alpine
 and debian

---
 doi.jq | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/doi.jq b/doi.jq
index 08adb8d..f113886 100644
--- a/doi.jq
+++ b/doi.jq
@@ -3,21 +3,6 @@
 # see "Jenkinsfile.meta" for how/why this turns into "subset.txt"
 def repos_anti_subset:
 	[
-		# as we remove items from this list, we need to be careful that none of their *children* are still in the list
-		# (which is why this is sorted in rough "build order" -- that means we can ~safely "pop" off the bottom)
-		"clearlinux",
-		"couchbase",
-
-		"alpine", # direct children: amazoncorretto amazonlinux api-firewall arangodb archlinux bash bonita caddy chronograf docker eclipse-mosquitto eclipse-temurin eggdrop erlang fluentd golang haproxy haxe httpd influxdb irssi julia kapacitor kong liquibase memcached nats nats-streaming nginx node notary php postgres python rabbitmq rakudo-star redis registry ruby rust spiped teamspeak telegraf traefik varnish znc
-		"api-firewall",
-		"nats",
-		"teamspeak",
-
-		"debian", # direct children: aerospike buildpack-deps chronograf clojure couchdb dart emqx erlang haproxy haskell hitch httpd influxdb irssi julia maven memcached mono mysql neo4j neurodebian nginx node odoo openjdk perl php postgres pypy python r-base redis rethinkdb rocket.chat ruby rust spiped swipl unit varnish
-		"dart",
-		"rocket.chat",
-		"varnish",
-
 		empty
 	]
 ;
@@ -28,6 +13,7 @@ def _sbom_subset:
 		# only repositories we have explicitly verified
 		"aerospike",
 		"almalinux",
+		"alpine",
 		"alt",
 		"amazoncorretto",
 		"amazonlinux",
@@ -47,6 +33,7 @@ def _sbom_subset:
 		"convertigo",
 		"couchdb",
 		"crate",
+		"debian",
 		"drupal",
 		"eclipse-mosquitto",
 		"eclipse-temurin",
@@ -148,6 +135,18 @@ def _sbom_subset:
 		# "postfixadmin",
 		# "yourls",
 
+		# TODO: add these when the golang dependencies are fixed
+		# "api-firewall",
+		# "nats",
+		# "couchbase",
+
+		# TODO: add these when sbom scanning issues fixed
+		# "dart",
+		# "clearlinux",
+		# "rocket.chat",
+		# "teamspeak",
+		# "varnish",
+
 		empty
 	]
 ;