Skip to content

Commit 7c15c74

Browse files
Revert "Added inline SBOM for binaries downloaded outside package manager"
This reverts commit 6f4ae83.
1 parent ef9747f commit 7c15c74

File tree

15 files changed

+13
-57
lines changed

15 files changed

+13
-57
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
.jq-template.awk
2-
template-helper-functions.jq

11/alpine3.18/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

11/alpine3.19/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

12/alpine3.18/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

12/alpine3.19/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

13/alpine3.18/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

13/alpine3.19/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

14/alpine3.18/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

14/alpine3.19/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

15/alpine3.18/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

15/alpine3.19/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

16/alpine3.18/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

16/alpine3.19/Dockerfile

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-alpine.template

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ include "template-helper-functions" }}
21
FROM alpine:{{ env.variant | ltrimstr("alpine") }}
32

43
# 70 is the standard uid/gid for "postgres" in Alpine
@@ -165,20 +164,7 @@ RUN set -eux; \
165164
/usr/local/share/doc \
166165
/usr/local/share/man \
167166
; \
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-
; \
167+
\
182168
postgres --version
183169

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

apply-templates.sh

-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ 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-
2116
if [ "$#" -eq 0 ]; then
2217
versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
2318
eval "set -- $versions"

0 commit comments

Comments
 (0)