diff --git a/.gitignore b/.gitignore index c8db931ea..d548f66de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .jq-template.awk -.template-helper-functions.jq diff --git a/6.2/alpine/Dockerfile b/6.2/alpine/Dockerfile index c90c4878a..43d02e104 100644 --- a/6.2/alpine/Dockerfile +++ b/6.2/alpine/Dockerfile @@ -128,9 +128,7 @@ RUN set -eux; \ apk del --no-network .build-deps; \ \ redis-cli --version; \ - redis-server --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-server-sbom","packages":[{"name":"redis-server","versionInfo":"6.2.14","SPDXID":"SPDXRef-Package--redis-server","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/redis-server@6.2.14?os_name=alpine&os_version=3.20"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/6.2/debian/Dockerfile b/6.2/debian/Dockerfile index 056355ce1..7f3c1c754 100644 --- a/6.2/debian/Dockerfile +++ b/6.2/debian/Dockerfile @@ -137,9 +137,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ redis-cli --version; \ - redis-server --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-server-sbom","packages":[{"name":"redis-server","versionInfo":"6.2.14","SPDXID":"SPDXRef-Package--redis-server","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/redis-server@6.2.14?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile index bb4560c88..80aaa20b7 100644 --- a/7.0/alpine/Dockerfile +++ b/7.0/alpine/Dockerfile @@ -128,9 +128,7 @@ RUN set -eux; \ apk del --no-network .build-deps; \ \ redis-cli --version; \ - redis-server --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-server-sbom","packages":[{"name":"redis-server","versionInfo":"7.0.15","SPDXID":"SPDXRef-Package--redis-server","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/redis-server@7.0.15?os_name=alpine&os_version=3.20"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/7.0/debian/Dockerfile b/7.0/debian/Dockerfile index a2db5baa1..d252fa65c 100644 --- a/7.0/debian/Dockerfile +++ b/7.0/debian/Dockerfile @@ -137,9 +137,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ redis-cli --version; \ - redis-server --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-server-sbom","packages":[{"name":"redis-server","versionInfo":"7.0.15","SPDXID":"SPDXRef-Package--redis-server","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/redis-server@7.0.15?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/7.2/alpine/Dockerfile b/7.2/alpine/Dockerfile index c2fc29d81..19304a8d4 100644 --- a/7.2/alpine/Dockerfile +++ b/7.2/alpine/Dockerfile @@ -128,9 +128,7 @@ RUN set -eux; \ apk del --no-network .build-deps; \ \ redis-cli --version; \ - redis-server --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-server-sbom","packages":[{"name":"redis-server","versionInfo":"7.2.5","SPDXID":"SPDXRef-Package--redis-server","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/redis-server@7.2.5?os_name=alpine&os_version=3.20"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/7.2/debian/Dockerfile b/7.2/debian/Dockerfile index 92d7a8355..3e2fbd135 100644 --- a/7.2/debian/Dockerfile +++ b/7.2/debian/Dockerfile @@ -137,9 +137,7 @@ RUN set -eux; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ redis-cli --version; \ - redis-server --version; \ - \ - echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-server-sbom","packages":[{"name":"redis-server","versionInfo":"7.2.5","SPDXID":"SPDXRef-Package--redis-server","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/redis-server@7.2.5?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/Dockerfile.template b/Dockerfile.template index 8cf3ad3f1..489f6102a 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,4 +1,3 @@ -{{ include ".template-helper-functions" -}} {{ if env.variant == "alpine" then ( -}} FROM alpine:{{ .alpine.version }} {{ ) else ( -}} @@ -225,30 +224,7 @@ RUN set -eux; \ {{ ) end -}} \ redis-cli --version; \ - redis-server --version; \ - \ - echo {{ - { - name: "redis-server", - version: .version, - params: ( - if env.variant == "alpine" then - { - os_name: "alpine", - os_version: .alpine.version, - } - else - { - os_name: "debian", - os_version: .debian.version, - } - end - ), - licenses: [ - "BSD-3-Clause" - ] - } | sbom | tostring | @sh - }} > /usr/local/redis.spdx.json + redis-server --version RUN mkdir /data && chown redis:redis /data VOLUME /data diff --git a/apply-templates.sh b/apply-templates.sh index 51656bf7a..2af30c7de 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -11,14 +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 - # https://github.com/docker-library/bashbrew/blob/master/scripts/template-helper-functions.jq - 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"