Skip to content

Commit 9790d18

Browse files
committed
make redis images available locally
1 parent a22265d commit 9790d18

56 files changed

Lines changed: 7108 additions & 9 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: B&R dep Bitnami Redis Exporter
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- 'external/bitnami-deprecated-redis-exporter/1/debian-12/**'
8+
- '.github/workflows/release-bitnami-redis-exporter.yml'
9+
10+
jobs:
11+
build-and-push:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
packages: write
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v4
19+
20+
- name: Set up Docker Buildx
21+
uses: docker/setup-buildx-action@v3
22+
23+
- name: Extract Docker metadata
24+
id: meta
25+
uses: docker/metadata-action@v3
26+
with:
27+
images: ghcr.io/${{ github.repository }}/bitnami-deprecated-redis-exporter
28+
tags: |
29+
type=raw,value=1
30+
type=raw,value=latest
31+
32+
- name: Log in to GitHub Container Registry
33+
uses: docker/login-action@v3
34+
with:
35+
registry: ghcr.io
36+
username: ${{ github.actor }}
37+
password: ${{ secrets.GITHUB_TOKEN }}
38+
39+
- name: Build and push Docker image
40+
uses: docker/build-push-action@v6
41+
with:
42+
context: external/bitnami-deprecated-redis-exporter/1/debian-12
43+
file: external/bitnami-deprecated-redis-exporter/1/debian-12/Dockerfile
44+
push: true
45+
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/release-bitnami-redis-sentinel.yml

Whitespace-only changes.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: B&R dep Bitnami Redis
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- 'external/bitnami-deprecated-redis/8.2/debian-12/**'
8+
- '.github/workflows/release-bitnami-redis.yml'
9+
10+
jobs:
11+
build-and-push:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
packages: write
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v4
19+
20+
- name: Set up Docker Buildx
21+
uses: docker/setup-buildx-action@v3
22+
23+
- name: Extract Docker metadata
24+
id: meta
25+
uses: docker/metadata-action@v3
26+
with:
27+
images: ghcr.io/${{ github.repository }}/bitnami-deprecated-redis
28+
tags: |
29+
type=raw,value=8.2
30+
type=raw,value=latest
31+
32+
- name: Log in to GitHub Container Registry
33+
uses: docker/login-action@v3
34+
with:
35+
registry: ghcr.io
36+
username: ${{ github.actor }}
37+
password: ${{ secrets.GITHUB_TOKEN }}
38+
39+
- name: Build and push Docker image
40+
uses: docker/build-push-action@v6
41+
with:
42+
context: external/bitnami-deprecated-redis/8.2/debian-12
43+
file: external/bitnami-deprecated-redis/8.2/debian-12/Dockerfile
44+
push: true
45+
tags: ${{ steps.meta.outputs.tags }}

chart/kubeapps/charts/redis/values.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ diagnosticMode:
112112
## @param image.debug Enable image debug mode
113113
##
114114
image:
115-
registry: docker.io
116-
repository: bitnami/redis
117-
tag: 8.2.1-debian-12-r0
115+
registry: ghcr.io
116+
repository: sap/kubeapps/bitnami-deprecated-redis
117+
tag: 8.2
118118
digest: ""
119119
## Specify a imagePullPolicy
120120
## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
@@ -1184,9 +1184,9 @@ sentinel:
11841184
## @param sentinel.image.debug Enable image debug mode
11851185
##
11861186
image:
1187-
registry: docker.io
1188-
repository: bitnami/redis-sentinel
1189-
tag: 8.2.1-debian-12-r0
1187+
registry: ghcr.io
1188+
repository: sap/kubeapps/deprecated-bitnami-redis-sentinel
1189+
tag: 8.2
11901190
digest: ""
11911191
## Specify a imagePullPolicy
11921192
## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
@@ -1783,9 +1783,9 @@ metrics:
17831783
## @param metrics.image.pullSecrets Redis(R) Exporter image pull secrets
17841784
##
17851785
image:
1786-
registry: docker.io
1787-
repository: bitnami/redis-exporter
1788-
tag: 1.76.0-debian-12-r0
1786+
registry: ghcr.io
1787+
repository: sap/kubeapps/bitnami-deprecated-redis-exporter
1788+
tag: 1
17891789
digest: ""
17901790
pullPolicy: IfNotPresent
17911791
## Optionally specify an array of imagePullSecrets.
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copyright Broadcom, Inc. All Rights Reserved.
2+
# SPDX-License-Identifier: APACHE-2.0
3+
4+
FROM docker.io/bitnami/minideb:bookworm
5+
6+
ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
7+
ARG TARGETARCH
8+
9+
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
10+
org.opencontainers.image.created="2025-09-12T06:41:42Z" \
11+
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
12+
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/redis-exporter/README.md" \
13+
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/redis-exporter" \
14+
org.opencontainers.image.title="redis-exporter" \
15+
org.opencontainers.image.vendor="Broadcom, Inc." \
16+
org.opencontainers.image.version="1.77.0"
17+
18+
ENV HOME="/" \
19+
OS_ARCH="${TARGETARCH:-amd64}" \
20+
OS_FLAVOUR="debian-12" \
21+
OS_NAME="linux"
22+
23+
COPY prebuildfs /
24+
SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
25+
# Install required system packages and dependencies
26+
RUN install_packages ca-certificates curl procps
27+
RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
28+
DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
29+
mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
30+
COMPONENTS=( \
31+
"redis-exporter-1.77.0-0-linux-${OS_ARCH}-debian-12" \
32+
) ; \
33+
for COMPONENT in "${COMPONENTS[@]}"; do \
34+
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
35+
curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
36+
curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
37+
fi ; \
38+
sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
39+
tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
40+
rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
41+
done
42+
RUN apt-get update && apt-get upgrade -y && \
43+
apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
44+
RUN chmod g+rwX /opt/bitnami
45+
RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
46+
RUN uninstall_packages curl
47+
48+
ENV APP_VERSION="1.77.0" \
49+
BITNAMI_APP_NAME="redis-exporter" \
50+
IMAGE_REVISION="0" \
51+
PATH="/opt/bitnami/redis-exporter/bin:$PATH"
52+
53+
EXPOSE 9121
54+
55+
WORKDIR /opt/bitnami/redis-exporter
56+
USER 1001
57+
ENTRYPOINT [ "redis_exporter" ]
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Bitnami containers ship with software bundles. You can find the licenses under:
2+
/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/sh
2+
# Copyright Broadcom, Inc. All Rights Reserved.
3+
# SPDX-License-Identifier: APACHE-2.0
4+
set -eu
5+
6+
n=0
7+
max=2
8+
export DEBIAN_FRONTEND=noninteractive
9+
10+
until [ $n -gt $max ]; do
11+
set +e
12+
(
13+
apt-get update -qq &&
14+
apt-get install -y --no-install-recommends "$@"
15+
)
16+
CODE=$?
17+
set -e
18+
if [ $CODE -eq 0 ]; then
19+
break
20+
fi
21+
if [ $n -eq $max ]; then
22+
exit $CODE
23+
fi
24+
echo "apt failed, retrying"
25+
n=$(($n + 1))
26+
done
27+
apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/sh
2+
# Copyright Broadcom, Inc. All Rights Reserved.
3+
# SPDX-License-Identifier: APACHE-2.0
4+
set -u
5+
6+
if [ $# -eq 0 ]; then
7+
>&2 echo "No arguments provided"
8+
exit 1
9+
fi
10+
11+
script=$1
12+
exit_code="${2:-96}"
13+
fail_if_not_present="${3:-n}"
14+
15+
if test -f "$script"; then
16+
sh $script
17+
18+
if [ $? -ne 0 ]; then
19+
exit $((exit_code))
20+
fi
21+
elif [ "$fail_if_not_present" = "y" ]; then
22+
>&2 echo "script not found: $script"
23+
exit 127
24+
fi
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
# Copyright Broadcom, Inc. All Rights Reserved.
3+
# SPDX-License-Identifier: APACHE-2.0
4+
set -eu
5+
6+
n=0
7+
max=2
8+
export DEBIAN_FRONTEND=noninteractive
9+
10+
until [ $n -gt $max ]; do
11+
set +e
12+
(
13+
apt-get autoremove --purge -y "$@"
14+
)
15+
CODE=$?
16+
set -e
17+
if [ $CODE -eq 0 ]; then
18+
break
19+
fi
20+
if [ $n -eq $max ]; then
21+
exit $CODE
22+
fi
23+
echo "apt failed, retrying"
24+
n=$(($n + 1))
25+
done
26+
apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Copyright Broadcom, Inc. All Rights Reserved.
2+
# SPDX-License-Identifier: APACHE-2.0
3+
4+
FROM docker.io/bitnami/minideb:bookworm
5+
6+
ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
7+
ARG TARGETARCH
8+
9+
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
10+
org.opencontainers.image.created="2025-09-07T02:34:25Z" \
11+
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
12+
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/redis-sentinel/README.md" \
13+
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/redis-sentinel" \
14+
org.opencontainers.image.title="redis-sentinel" \
15+
org.opencontainers.image.vendor="Broadcom, Inc." \
16+
org.opencontainers.image.version="8.2.1"
17+
18+
ENV HOME="/" \
19+
OS_ARCH="${TARGETARCH:-amd64}" \
20+
OS_FLAVOUR="debian-12" \
21+
OS_NAME="linux" \
22+
PATH="/opt/bitnami/redis-sentinel/bin:$PATH"
23+
24+
COPY prebuildfs /
25+
SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
26+
# Install required system packages and dependencies
27+
RUN install_packages ca-certificates curl libgcc-s1 libssl3 libstdc++6 openssl procps
28+
RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
29+
DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
30+
mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
31+
COMPONENTS=( \
32+
"redis-sentinel-8.2.1-0-linux-${OS_ARCH}-debian-12" \
33+
) ; \
34+
for COMPONENT in "${COMPONENTS[@]}"; do \
35+
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
36+
curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
37+
curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
38+
fi ; \
39+
sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
40+
tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
41+
rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
42+
done
43+
RUN apt-get update && apt-get upgrade -y && \
44+
apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
45+
RUN chmod g+rwX /opt/bitnami
46+
RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
47+
RUN uninstall_packages curl
48+
49+
COPY rootfs /
50+
RUN /opt/bitnami/scripts/redis-sentinel/postunpack.sh
51+
ENV APP_VERSION="8.2.1" \
52+
BITNAMI_APP_NAME="redis-sentinel" \
53+
IMAGE_REVISION="1"
54+
55+
EXPOSE 26379
56+
57+
USER 1001
58+
ENTRYPOINT [ "/opt/bitnami/scripts/redis-sentinel/entrypoint.sh" ]
59+
CMD [ "/opt/bitnami/scripts/redis-sentinel/run.sh" ]

0 commit comments

Comments
 (0)