Remove manual SBOM

docker-library · May 23, 2024 · 2ca33e8 · 2ca33e8
1 parent 672d3a9
commit 2ca33e8
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
 .jq-template.awk
-.template-helper-functions.jq
diff --git a/1.10/alpine3.19/Dockerfile b/1.10/alpine3.19/Dockerfile
diff --git a/1.10/alpine3.20/Dockerfile b/1.10/alpine3.20/Dockerfile
diff --git a/1.10/bookworm/Dockerfile b/1.10/bookworm/Dockerfile
diff --git a/1.10/bullseye/Dockerfile b/1.10/bullseye/Dockerfile
diff --git a/1.11-rc/alpine3.19/Dockerfile b/1.11-rc/alpine3.19/Dockerfile
diff --git a/1.11-rc/alpine3.20/Dockerfile b/1.11-rc/alpine3.20/Dockerfile
diff --git a/1.11-rc/bookworm/Dockerfile b/1.11-rc/bookworm/Dockerfile
diff --git a/1.11-rc/bullseye/Dockerfile b/1.11-rc/bullseye/Dockerfile
diff --git a/1.6/alpine3.19/Dockerfile b/1.6/alpine3.19/Dockerfile
diff --git a/1.6/alpine3.20/Dockerfile b/1.6/alpine3.20/Dockerfile
diff --git a/1.6/bookworm/Dockerfile b/1.6/bookworm/Dockerfile
diff --git a/1.6/bullseye/Dockerfile b/1.6/bullseye/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -1,4 +1,3 @@
-{{ include ".template-helper-functions" -}}
 {{
 	def is_alpine:
 		env.variant | startswith("alpine")
@@ -122,21 +121,7 @@ RUN set -eux; \
 {{ ) end -}}
 	\
 # smoke test
-	julia --version; \
-	\
-	echo {{
-		{
-			name: "julia",
-			version: .version,
-			params: {
-				os_name: (if is_alpine then "alpine" else "debian" end),
-				os_version: env.variant | ltrimstr("alpine")
-			},
-			licenses: [
-				"MIT"
-			]
-		} | sbom | tostring | @sh
-	}} > $JULIA_PATH/julia.spdx.json;
+	julia --version
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/apply-templates.sh b/apply-templates.sh
@@ -11,13 +11,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 [ -n "${BASHBREW_SCRIPTS:-}" ]; then
-	jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq"
-elif [ "$BASH_SOURCE" -nt "$jqf" ]; then
-	wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/08c926140ad0af22de58c2a2656afda58082ba3e/scripts/template-helper-functions.jq'
-fi
-
 if [ "$#" -eq 0 ]; then
 	versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
 	eval "set -- $versions"