Skip to content

Commit 2ca33e8

Browse files
Remove manual SBOM
1 parent 672d3a9 commit 2ca33e8

File tree

15 files changed

+13
-60
lines changed

15 files changed

+13
-60
lines changed

.gitignore

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

1.10/alpine3.19/Dockerfile

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

1.10/alpine3.20/Dockerfile

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

1.10/bookworm/Dockerfile

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

1.10/bullseye/Dockerfile

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

1.11-rc/alpine3.19/Dockerfile

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

1.11-rc/alpine3.20/Dockerfile

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

1.11-rc/bookworm/Dockerfile

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

1.11-rc/bullseye/Dockerfile

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

1.6/alpine3.19/Dockerfile

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

1.6/alpine3.20/Dockerfile

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

1.6/bookworm/Dockerfile

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

1.6/bullseye/Dockerfile

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

Dockerfile-linux.template

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ include ".template-helper-functions" -}}
21
{{
32
def is_alpine:
43
env.variant | startswith("alpine")
@@ -122,21 +121,7 @@ RUN set -eux; \
122121
{{ ) end -}}
123122
\
124123
# smoke test
125-
julia --version; \
126-
\
127-
echo {{
128-
{
129-
name: "julia",
130-
version: .version,
131-
params: {
132-
os_name: (if is_alpine then "alpine" else "debian" end),
133-
os_version: env.variant | ltrimstr("alpine")
134-
},
135-
licenses: [
136-
"MIT"
137-
]
138-
} | sbom | tostring | @sh
139-
}} > $JULIA_PATH/julia.spdx.json;
124+
julia --version
140125

141126
COPY docker-entrypoint.sh /usr/local/bin/
142127
ENTRYPOINT ["docker-entrypoint.sh"]

apply-templates.sh

-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ elif [ "$BASH_SOURCE" -nt "$jqt" ]; then
1111
wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk'
1212
fi
1313

14-
jqf='.template-helper-functions.jq'
15-
if [ -n "${BASHBREW_SCRIPTS:-}" ]; then
16-
jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq"
17-
elif [ "$BASH_SOURCE" -nt "$jqf" ]; then
18-
wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/08c926140ad0af22de58c2a2656afda58082ba3e/scripts/template-helper-functions.jq'
19-
fi
20-
2114
if [ "$#" -eq 0 ]; then
2215
versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
2316
eval "set -- $versions"

0 commit comments

Comments
 (0)