Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
.jq-template.awk
.template-helper-functions.jq
4 changes: 1 addition & 3 deletions 6.2/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions 6.2/debian/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions 7.0/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions 7.0/debian/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions 7.2/alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions 7.2/debian/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 1 addition & 25 deletions Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{ include ".template-helper-functions" -}}
{{ if env.variant == "alpine" then ( -}}
FROM alpine:{{ .alpine.version }}
{{ ) else ( -}}
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions apply-templates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down