Skip to content

Pin Redis image for entrypoint env tests #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjmiller609 merged 1 commit into from
Jul 8, 2026
+8 −5
Merged

Pin Redis image for entrypoint env tests #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cmd/test-prewarm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ var defaultImages = []prewarmImage{
{Source: "docker.io/library/alpine:3.18"},
{Source: "docker.io/library/debian:12-slim"},
{Source: "docker.io/library/nginx:alpine"},
{Source: "docker.io/bitnami/redis:latest"},
// Keep in sync with redisEntrypointEnvImage in lib/instances tests.
{Source: "docker.io/bitnamilegacy/redis:7.2.5-debian-12-r0"},
{Source: "docker.io/jrei/systemd-ubuntu:22.04"},
// amd64-only mirror for the Rosetta x86 image E2E (single-platform manifest;
// see toLocalRegistryRef for why it must be the only mirror of this tag).
Expand Down
6 changes: 4 additions & 2 deletions lib/instances/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,6 +1159,8 @@ func TestOOMExitPropagation(t *testing.T) {
t.Skipf("OOM did not trigger reliably on this host after %d attempts (last observed state: %s)", retries, lastObservedState)
}

const redisEntrypointEnvImage = "docker.io/bitnamilegacy/redis:7.2.5-debian-12-r0"
Comment thread
cursor[bot] marked this conversation as resolved.

// TestEntrypointEnvVars verifies that environment variables are passed to the entrypoint process.
// This uses bitnami/redis which configures REDIS_PASSWORD from an env var - if auth is required,
// it proves the entrypoint received and used the env var.
Expand All @@ -1180,7 +1182,7 @@ func TestEntrypointEnvVars(t *testing.T) {
// Pull bitnami/redis image
t.Log("Pulling bitnami/redis image...")
redisImage, err := imageManager.CreateImage(ctx, images.CreateImageRequest{
Name: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"),
Name: integrationTestImageRef(t, redisEntrypointEnvImage),
})
require.NoError(t, err)

Expand Down Expand Up @@ -1218,7 +1220,7 @@ func TestEntrypointEnvVars(t *testing.T) {
testPassword := "test_secret_password_123"
req := CreateInstanceRequest{
Name: "test-redis-env",
Image: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"),
Image: integrationTestImageRef(t, redisEntrypointEnvImage),
Size: 2 * 1024 * 1024 * 1024,
HotplugSize: 512 * 1024 * 1024,
OverlaySize: 10 * 1024 * 1024 * 1024,
Expand Down
4 changes: 2 additions & 2 deletions lib/instances/qemu_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ func TestQEMUEntrypointEnvVars(t *testing.T) {
// Pull bitnami/redis image
t.Log("Pulling bitnami/redis image...")
redisImage, err := imageManager.CreateImage(ctx, images.CreateImageRequest{
Name: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"),
Name: integrationTestImageRef(t, redisEntrypointEnvImage),
})
require.NoError(t, err)

Expand Down Expand Up @@ -648,7 +648,7 @@ func TestQEMUEntrypointEnvVars(t *testing.T) {
testPassword := "test_secret_password_123"
req := CreateInstanceRequest{
Name: "test-redis-env",
Image: integrationTestImageRef(t, "docker.io/bitnami/redis:latest"),
Image: integrationTestImageRef(t, redisEntrypointEnvImage),
Size: 2 * 1024 * 1024 * 1024,
HotplugSize: 512 * 1024 * 1024,
OverlaySize: 10 * 1024 * 1024 * 1024,
Expand Down
Loading