Merge pull request #44 from joshrotenberg/fix/docker-multi-arch

fix: Docker multi-arch build using pre-built binaries

Author: joshrotenberg

.github/workflows/docker-publish.yml

@@ -2,10 +2,10 @@ name: Docker Publish
 
 on:
   push:
-    tags:
-      - 'redisctl-v*'
     branches:
       - main
+  release:
+    types: [published]
   workflow_dispatch:
 
 env:
@@ -46,19 +46,34 @@ jobs:
             type=sha,prefix=sha-
             type=raw,value=latest,enable={{is_default_branch}}
 
+      - name: Set build parameters
+        id: build-params
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            VERSION="${{ github.event.release.tag_name }}"
+            VERSION="${VERSION#redisctl-v}"
+            echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+            echo "DOCKERFILE=./Dockerfile" >> $GITHUB_OUTPUT
+            echo "PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+          else
+            echo "VERSION=dev" >> $GITHUB_OUTPUT
+            echo "DOCKERFILE=./Dockerfile.dev" >> $GITHUB_OUTPUT
+            echo "PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
+          fi
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile.publish
-          platforms: linux/amd64,linux/arm64
+          file: ${{ steps.build-params.outputs.DOCKERFILE }}
+          platforms: ${{ steps.build-params.outputs.PLATFORMS }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            RUST_VERSION=1.89
+            VERSION=${{ steps.build-params.outputs.VERSION }}
 
       - name: Update Docker Hub Description
         uses: peter-evans/dockerhub-description@v4

Dockerfile

@@ -1,28 +1,36 @@
 # Redis CLI Docker Image
-# Multi-stage build for optimal size
+# Uses pre-built binaries from GitHub releases for faster multi-arch builds
 
-FROM rust:1.89 AS builder
-
-WORKDIR /build
-
-# Copy workspace files
-COPY Cargo.toml ./
-COPY crates/ ./crates/
-
-# Build release binary
-RUN cargo build --release --bin redisctl
-
-# Runtime stage - Ubuntu for newer GLIBC
 FROM ubuntu:24.04
 
 # Install runtime dependencies
 RUN apt-get update && apt-get install -y \
     ca-certificates \
     curl \
+    xz-utils \
     && rm -rf /var/lib/apt/lists/*
 
-# Copy binary from builder
-COPY --from=builder /build/target/release/redisctl /usr/local/bin/redisctl
+# Set the version to install
+ARG VERSION=0.2.0
+ARG TARGETPLATFORM
+
+# Download the appropriate binary based on platform
+RUN case "$TARGETPLATFORM" in \
+        "linux/amd64") \
+            ARCH="x86_64-unknown-linux-gnu" \
+            ;; \
+        "linux/arm64") \
+            ARCH="aarch64-unknown-linux-gnu" \
+            ;; \
+        *) \
+            echo "Unsupported platform: $TARGETPLATFORM" && exit 1 \
+            ;; \
+    esac && \
+    curl -L "https://github.com/joshrotenberg/redisctl/releases/download/redisctl-v${VERSION}/redisctl-${ARCH}.tar.xz" | \
+    tar -xJ --strip-components=1 -C /tmp && \
+    mv /tmp/redisctl /usr/local/bin/redisctl && \
+    chmod +x /usr/local/bin/redisctl && \
+    rm -rf /tmp/*
 
 # Create non-root user
 RUN useradd -m redis && \
@@ -37,7 +45,7 @@ ENV REDIS_ENTERPRISE_URL=""
 ENV REDIS_ENTERPRISE_USER=""
 ENV REDIS_ENTERPRISE_PASSWORD=""
 ENV REDIS_CLOUD_API_KEY=""
-ENV REDIS_CLOUD_SECRET_KEY=""
+ENV REDIS_CLOUD_API_SECRET=""
 
 ENTRYPOINT ["redisctl"]
 CMD ["--help"]

Dockerfile.dev

@@ -0,0 +1,42 @@
+# Development Docker Image
+# Builds from source for main branch pushes
+
+FROM rust:1.89 AS builder
+
+WORKDIR /build
+
+# Copy workspace files
+COPY Cargo.toml ./
+COPY crates/ ./crates/
+
+# Build release binary
+RUN cargo build --release --bin redisctl
+
+# Runtime stage - Ubuntu for newer GLIBC
+FROM ubuntu:24.04
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy binary from builder
+COPY --from=builder /build/target/release/redisctl /usr/local/bin/redisctl
+
+# Create non-root user
+RUN useradd -m redis && \
+    mkdir -p /home/redis/.config/redisctl && \
+    chown -R redis:redis /home/redis
+
+USER redis
+WORKDIR /home/redis
+
+# Default environment variables
+ENV REDIS_ENTERPRISE_URL=""
+ENV REDIS_ENTERPRISE_USER=""
+ENV REDIS_ENTERPRISE_PASSWORD=""
+ENV REDIS_CLOUD_API_KEY=""
+ENV REDIS_CLOUD_API_SECRET=""
+
+ENTRYPOINT ["redisctl"]
+CMD ["--help"]