Merge pull request #400 from infosiftr/no-spdx

Remove manual SPDX
redis · May 23, 2024 · 7487c78 · 7487c78
2 parents 8ba7c1c + 5f08363
commit 7487c78
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 52 deletions.
diff --git 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
diff --git a/6.2/debian/Dockerfile b/6.2/debian/Dockerfile
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
diff --git a/7.0/debian/Dockerfile b/7.0/debian/Dockerfile
diff --git a/7.2/alpine/Dockerfile b/7.2/alpine/Dockerfile
diff --git a/7.2/debian/Dockerfile b/7.2/debian/Dockerfile
diff --git 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
@@ -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"