Skip to content

Commit 85d2cc1

Browse files
LaurentGoderreLaurentGoderre
committed
Added explicit attestation for Redis
1 parent 12e802f commit 85d2cc1

File tree

12 files changed

+64
-10
lines changed

12 files changed

+64
-10
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

‎6.0/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ RUN set -eux; \
9595
apk del --no-network .build-deps; \
9696
\
9797
redis-cli --version; \
98-
redis-server --version
98+
redis-server --version; \
99+
\
100+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"6.0.20","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
99101

100102
RUN mkdir /data && chown redis:redis /data
101103
VOLUME /data

‎6.0/bookworm/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ RUN set -eux; \
113113
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
114114
\
115115
redis-cli --version; \
116-
redis-server --version
116+
redis-server --version; \
117+
\
118+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"6.0.20","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
117119

118120
RUN mkdir /data && chown redis:redis /data
119121
VOLUME /data

‎6.2/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ RUN set -eux; \
9595
apk del --no-network .build-deps; \
9696
\
9797
redis-cli --version; \
98-
redis-server --version
98+
redis-server --version; \
99+
\
100+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"6.2.14","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
99101

100102
RUN mkdir /data && chown redis:redis /data
101103
VOLUME /data

‎6.2/bookworm/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ RUN set -eux; \
113113
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
114114
\
115115
redis-cli --version; \
116-
redis-server --version
116+
redis-server --version; \
117+
\
118+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"6.2.14","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
117119

118120
RUN mkdir /data && chown redis:redis /data
119121
VOLUME /data

‎7.0/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ RUN set -eux; \
9595
apk del --no-network .build-deps; \
9696
\
9797
redis-cli --version; \
98-
redis-server --version
98+
redis-server --version; \
99+
\
100+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"7.0.14","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
99101

100102
RUN mkdir /data && chown redis:redis /data
101103
VOLUME /data

‎7.0/bookworm/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ RUN set -eux; \
113113
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
114114
\
115115
redis-cli --version; \
116-
redis-server --version
116+
redis-server --version; \
117+
\
118+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"7.0.14","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
117119

118120
RUN mkdir /data && chown redis:redis /data
119121
VOLUME /data

‎7.2/alpine3.18/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ RUN set -eux; \
9595
apk del --no-network .build-deps; \
9696
\
9797
redis-cli --version; \
98-
redis-server --version
98+
redis-server --version; \
99+
\
100+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"7.2.2","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
99101

100102
RUN mkdir /data && chown redis:redis /data
101103
VOLUME /data

‎7.2/bookworm/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ RUN set -eux; \
113113
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
114114
\
115115
redis-cli --version; \
116-
redis-server --version
116+
redis-server --version; \
117+
\
118+
echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"redis-sbom","packages":[{"name":"redis","versionInfo":"7.2.2","SPDXID":"SPDXRef-Package--redis","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=debian&os_version=bookworm"}],"licenseDeclared":"BSD-3-Clause"}]}' > /usr/local/redis.spdx.json
117119

118120
RUN mkdir /data && chown redis:redis /data
119121
VOLUME /data

‎Dockerfile-alpine.template

Lines changed: 16 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
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
@@ -89,7 +90,21 @@ RUN set -eux; \
8990
apk del --no-network .build-deps; \
9091
\
9192
redis-cli --version; \
92-
redis-server --version
93+
redis-server --version; \
94+
\
95+
echo {{
96+
{
97+
name: "redis",
98+
version: .version,
99+
params: {
100+
os_name: "alpine",
101+
os_version: env.variant | ltrimstr("alpine")
102+
},
103+
licenses: [
104+
"BSD-3-Clause"
105+
]
106+
} | sbom | tostring | @sh
107+
}} > /usr/local/redis.spdx.json
93108

94109
RUN mkdir /data && chown redis:redis /data
95110
VOLUME /data

‎Dockerfile.template

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{ include ".template-helper-functions" -}}
12
FROM debian:{{ env.variant }}-slim
23

34
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
@@ -107,7 +108,21 @@ RUN set -eux; \
107108
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
108109
\
109110
redis-cli --version; \
110-
redis-server --version
111+
redis-server --version; \
112+
\
113+
echo {{
114+
{
115+
name: "redis",
116+
version: .version,
117+
params: {
118+
os_name: "debian",
119+
os_version: env.variant
120+
},
121+
licenses: [
122+
"BSD-3-Clause"
123+
]
124+
} | sbom | tostring | @sh
125+
}} > /usr/local/redis.spdx.json
111126

112127
RUN mkdir /data && chown redis:redis /data
113128
VOLUME /data

‎apply-templates.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ 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 [ -n "${BASHBREW_SCRIPTS:-}" ]; then
18+
jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq"
19+
elif [ "$BASH_SOURCE" -nt "$jqf" ]; then
20+
wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq'
21+
fi
22+
1623
if [ "$#" -eq 0 ]; then
1724
versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
1825
eval "set -- $versions"

0 commit comments

Comments
 (0)