Merge pull request #1164 from LaurentGoderre/remove-inline-sbom

Revert "Added inline SBOM for binaries downloaded outside package manager
docker-library · Dec 11, 2023 · def0855 · def0855
2 parents d8c3360 + 1d4651c
commit def0855
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
 .jq-template.awk
-template-helper-functions.jq
diff --git a/12/alpine3.18/Dockerfile b/12/alpine3.18/Dockerfile
diff --git a/12/alpine3.19/Dockerfile b/12/alpine3.19/Dockerfile
diff --git a/13/alpine3.18/Dockerfile b/13/alpine3.18/Dockerfile
diff --git a/13/alpine3.19/Dockerfile b/13/alpine3.19/Dockerfile
diff --git a/14/alpine3.18/Dockerfile b/14/alpine3.18/Dockerfile
diff --git a/14/alpine3.19/Dockerfile b/14/alpine3.19/Dockerfile
diff --git a/15/alpine3.18/Dockerfile b/15/alpine3.18/Dockerfile
diff --git a/15/alpine3.19/Dockerfile b/15/alpine3.19/Dockerfile
diff --git a/16/alpine3.18/Dockerfile b/16/alpine3.18/Dockerfile
diff --git a/16/alpine3.19/Dockerfile b/16/alpine3.19/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,3 @@
-{{ include "template-helper-functions" }}
 FROM alpine:{{ env.variant | ltrimstr("alpine") }}
 
 # 70 is the standard uid/gid for "postgres" in Alpine
@@ -165,20 +164,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{{
-		{
-			name: "postgres",
-			version: .version,
-			params: {
-				os_name: "alpine",
-				os_version: env.variant | ltrimstr("alpine"),
-			},
-			licenses: [
-				"PostgreSQL"
-			]
-		} | sbom | tostring
-	}}' > /usr/local/postgres.spdx.json \
-	; \
+	\
 	postgres --version
 
 # make the sample config easier to munge (and "correct by default")

diff --git a/apply-templates.sh b/apply-templates.sh
@@ -13,11 +13,6 @@ elif [ "$BASH_SOURCE" -nt "$jqt" ]; then
 	wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk'
 fi
 
-jqf='template-helper-functions.jq'
-if [ "$BASH_SOURCE" -nt "$jqf" ]; then
-	wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq'
-fi
-
 if [ "$#" -eq 0 ]; then
 	versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
 	eval "set -- $versions"