diff --git a/.gitignore b/.gitignore index c8db931..d548f66 100644 --- 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 index 8e5f800..5426aa2 100644 --- a/1.10/alpine3.19/Dockerfile +++ b/1.10/alpine3.19/Dockerfile @@ -52,9 +52,7 @@ RUN set -eux; \ apk del --no-network .fetch-deps; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.10.3","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.10.3?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.10/alpine3.20/Dockerfile b/1.10/alpine3.20/Dockerfile index 2dd9c55..4678012 100644 --- a/1.10/alpine3.20/Dockerfile +++ b/1.10/alpine3.20/Dockerfile @@ -52,9 +52,7 @@ RUN set -eux; \ apk del --no-network .fetch-deps; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.10.3","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.10.3?os_name=alpine&os_version=3.20"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.10/bookworm/Dockerfile b/1.10/bookworm/Dockerfile index 3e9460a..c041036 100644 --- a/1.10/bookworm/Dockerfile +++ b/1.10/bookworm/Dockerfile @@ -80,9 +80,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.10.3","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.10.3?os_name=debian&os_version=bookworm"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.10/bullseye/Dockerfile b/1.10/bullseye/Dockerfile index 8a967d6..d7fa859 100644 --- a/1.10/bullseye/Dockerfile +++ b/1.10/bullseye/Dockerfile @@ -80,9 +80,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.10.3","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.10.3?os_name=debian&os_version=bullseye"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.11-rc/alpine3.19/Dockerfile b/1.11-rc/alpine3.19/Dockerfile index 7dfefbd..5520ac5 100644 --- a/1.11-rc/alpine3.19/Dockerfile +++ b/1.11-rc/alpine3.19/Dockerfile @@ -52,9 +52,7 @@ RUN set -eux; \ apk del --no-network .fetch-deps; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.11.0-beta1","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.11.0-beta1?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.11-rc/alpine3.20/Dockerfile b/1.11-rc/alpine3.20/Dockerfile index d4ca3b9..f3a883c 100644 --- a/1.11-rc/alpine3.20/Dockerfile +++ b/1.11-rc/alpine3.20/Dockerfile @@ -52,9 +52,7 @@ RUN set -eux; \ apk del --no-network .fetch-deps; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.11.0-beta1","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.11.0-beta1?os_name=alpine&os_version=3.20"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.11-rc/bookworm/Dockerfile b/1.11-rc/bookworm/Dockerfile index 1d8b1aa..edacff0 100644 --- a/1.11-rc/bookworm/Dockerfile +++ b/1.11-rc/bookworm/Dockerfile @@ -80,9 +80,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.11.0-beta1","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.11.0-beta1?os_name=debian&os_version=bookworm"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.11-rc/bullseye/Dockerfile b/1.11-rc/bullseye/Dockerfile index ac465d2..0be51a5 100644 --- a/1.11-rc/bullseye/Dockerfile +++ b/1.11-rc/bullseye/Dockerfile @@ -80,9 +80,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.11.0-beta1","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.11.0-beta1?os_name=debian&os_version=bullseye"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.6/alpine3.19/Dockerfile b/1.6/alpine3.19/Dockerfile index f60fdc2..bf51e37 100644 --- a/1.6/alpine3.19/Dockerfile +++ b/1.6/alpine3.19/Dockerfile @@ -52,9 +52,7 @@ RUN set -eux; \ apk del --no-network .fetch-deps; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.6.7","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.6.7?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.6/alpine3.20/Dockerfile b/1.6/alpine3.20/Dockerfile index 6fb3fa4..d33cf83 100644 --- a/1.6/alpine3.20/Dockerfile +++ b/1.6/alpine3.20/Dockerfile @@ -52,9 +52,7 @@ RUN set -eux; \ apk del --no-network .fetch-deps; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.6.7","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.6.7?os_name=alpine&os_version=3.20"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.6/bookworm/Dockerfile b/1.6/bookworm/Dockerfile index 676e237..ecfc53c 100644 --- a/1.6/bookworm/Dockerfile +++ b/1.6/bookworm/Dockerfile @@ -80,9 +80,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.6.7","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.6.7?os_name=debian&os_version=bookworm"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/1.6/bullseye/Dockerfile b/1.6/bullseye/Dockerfile index e703cb9..7f3e966 100644 --- a/1.6/bullseye/Dockerfile +++ b/1.6/bullseye/Dockerfile @@ -80,9 +80,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ # smoke test - julia --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"julia-sbom","packages":[{"name":"julia","versionInfo":"1.6.7","SPDXID":"SPDXRef-Package--julia","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/julia@1.6.7?os_name=debian&os_version=bullseye"}],"licenseDeclared":"MIT"}]}' > $JULIA_PATH/julia.spdx.json; + julia --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 889195d..cd38530 100644 --- 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 index 4128844..3f5eb3e 100755 --- 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"