Skip to content

Commit d0cdef8

Browse files
committed
fix image back yo redis-webcli
1 parent 11e16ee commit d0cdef8

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ ENV NO_URL_QUOTING True
1111
# Install memtier_benchmark from GitHub releases
1212
# Downloads the appropriate .deb file based on target architecture
1313
# Note: Version 2.1.1 is not available in the Redis APT repository, only on GitHub releases
14-
RUN apt-get update && \
15-
apt-get install -y --no-install-recommends curl && \
16-
curl -fsSL -o /tmp/memtier-benchmark.deb \
14+
RUN curl -fsSL -o /tmp/memtier-benchmark.deb \
1715
"https://github.com/RedisLabs/memtier_benchmark/releases/download/${MEMTIER_VERSION}/memtier-benchmark_${MEMTIER_VERSION}.bookworm_${TARGETARCH}.deb" && \
16+
apt-get update && \
1817
apt-get install -y --no-install-recommends /tmp/memtier-benchmark.deb && \
1918
rm /tmp/memtier-benchmark.deb && \
20-
rm -rf /var/lib/apt/lists/*
19+
rm -rf /var/lib/apt/lists/* && \
20+
memtier_benchmark --version
2121

2222
COPY . /app
2323
WORKDIR /app

Makefile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ memtier_benchmark:
88
@echo "This target is kept for backward compatibility only"
99

1010
# Docker multi-platform build targets
11-
.PHONY: docker-build docker-buildx-setup docker-push docker-push-test
11+
.PHONY: docker-build docker-buildx-setup docker-push
1212

1313
# Docker image configuration
14-
# For testing, use: make docker-push-test TAG=arm-support-v1
15-
# For production, use: make docker-push IMAGE_NAME=redislabs/redis-webcli TAG=v1.2.3
16-
# To override memtier version: make docker-push MEMTIER_VERSION=2.1.4
17-
IMAGE_NAME ?= almoggueta247/test-call-home
18-
TAG ?= arm-support-test
14+
# Usage: make docker-push TAG=v1.2.3
15+
# To override image name: make docker-push IMAGE_NAME=myregistry/myimage TAG=v1.2.3
16+
# To override memtier version: make docker-push TAG=v1.2.3 MEMTIER_VERSION=2.1.4
17+
# WARNING: TAG is required for push commands to prevent accidental overwrites
18+
IMAGE_NAME ?= redislabs/redis-webcli
19+
TAG ?=
1920
MEMTIER_VERSION ?= 2.1.1
2021

2122
# Setup buildx for multi-platform builds (run once)
@@ -29,14 +30,14 @@ docker-build:
2930
--build-arg MEMTIER_VERSION=$(MEMTIER_VERSION) \
3031
-t $(IMAGE_NAME):$(TAG) .
3132

32-
# Build and push multi-platform image to test registry
33-
docker-push-test:
34-
docker buildx build --platform linux/amd64,linux/arm64 \
35-
--build-arg MEMTIER_VERSION=$(MEMTIER_VERSION) \
36-
-t almoggueta247/test-call-home:$(TAG) --push .
37-
38-
# Build and push multi-platform image (use IMAGE_NAME variable for production)
33+
# Build and push multi-platform image (requires TAG to be set)
3934
docker-push:
35+
@if [ -z "$(TAG)" ]; then \
36+
echo "Error: TAG is required. Usage: make docker-push TAG=v1.2.3"; \
37+
exit 1; \
38+
fi
4039
docker buildx build --platform linux/amd64,linux/arm64 \
4140
--build-arg MEMTIER_VERSION=$(MEMTIER_VERSION) \
4241
-t $(IMAGE_NAME):$(TAG) --push .
42+
43+

0 commit comments

Comments
 (0)