Skip to content

Commit 6f4ae83

Browse files
LaurentGoderreLaurentGoderre
committed
Added inline SBOM for binaries downloaded outside package manager
1 parent 591d3dd commit 6f4ae83

File tree

15 files changed

+57
-13
lines changed

15 files changed

+57
-13
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.jq-template.awk
2+
template-helper-functions.jq

‎11/alpine3.17/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎11/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎12/alpine3.17/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎12/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎13/alpine3.17/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎13/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎14/alpine3.17/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎14/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎15/alpine3.17/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎15/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎16/alpine3.17/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎16/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile-alpine.template

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{ include "template-helper-functions" }}
12
FROM alpine:{{ env.variant | ltrimstr("alpine") }}
23

34
# 70 is the standard uid/gid for "postgres" in Alpine
@@ -164,7 +165,20 @@ RUN set -eux; \
164165
/usr/local/share/doc \
165166
/usr/local/share/man \
166167
; \
167-
\
168+
echo '{{
169+
{
170+
name: "postgres",
171+
version: .version,
172+
params: {
173+
os_name: "alpine",
174+
os_version: env.variant | ltrimstr("alpine"),
175+
},
176+
licenses: [
177+
"PostgreSQL"
178+
]
179+
} | sbom | tostring
180+
}}' > /usr/local/postgres.spdx.json \
181+
; \
168182
postgres --version
169183

170184
# make the sample config easier to munge (and "correct by default")

‎apply-templates.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ elif [ "$BASH_SOURCE" -nt "$jqt" ]; then
1313
wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk'
1414
fi
1515

16+
jqf='template-helper-functions.jq'
17+
if [ "$BASH_SOURCE" -nt "$jqf" ]; then
18+
wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq'
19+
fi
20+
1621
if [ "$#" -eq 0 ]; then
1722
versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
1823
eval "set -- $versions"

0 commit comments

Comments
 (0)