Merge pull request #86 from LaurentGoderre/sbom

Added attestation for julia
docker-library · Nov 14, 2023 · ca7b52d · ca7b52d
2 parents 9e6b1dd + ff6d8f6
commit ca7b52d
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .jq-template.awk
+.template-helper-functions.jq
diff --git a/1.10-rc/alpine3.17/Dockerfile b/1.10-rc/alpine3.17/Dockerfile
diff --git a/1.10-rc/alpine3.18/Dockerfile b/1.10-rc/alpine3.18/Dockerfile
diff --git a/1.10-rc/bookworm/Dockerfile b/1.10-rc/bookworm/Dockerfile
diff --git a/1.10-rc/bullseye/Dockerfile b/1.10-rc/bullseye/Dockerfile
diff --git a/1.6/alpine3.17/Dockerfile b/1.6/alpine3.17/Dockerfile
diff --git a/1.6/alpine3.18/Dockerfile b/1.6/alpine3.18/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/1.9/alpine3.17/Dockerfile b/1.9/alpine3.17/Dockerfile
diff --git a/1.9/alpine3.18/Dockerfile b/1.9/alpine3.18/Dockerfile
diff --git a/1.9/bookworm/Dockerfile b/1.9/bookworm/Dockerfile
diff --git a/1.9/bullseye/Dockerfile b/1.9/bullseye/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -1,3 +1,4 @@
+{{ include ".template-helper-functions" -}}
 {{
 	def is_alpine:
 		env.variant | startswith("alpine")
@@ -121,7 +122,21 @@ RUN set -eux; \
 {{ ) end -}}
 	\
 # smoke test
-	julia --version
+	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;
 
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/apply-templates.sh b/apply-templates.sh
@@ -11,6 +11,13 @@ 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"