Merge pull request #146 from powerloom/feat/docker_setup

Docker Setup Enhancement

Author: SwaroopH

.github/workflows/docker-publish.yml

@@ -23,8 +23,7 @@ env:
 jobs:
   build:
 
-    runs-on:
-      group: larger-runners
+    runs-on: warp-ubuntu-latest-x64-4x
     permissions:
       contents: read
       packages: write
@@ -34,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -47,18 +46,13 @@ jobs:
       #    cosign-release: 'v1.11.0'
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-
-      # Workaround: https://github.com/docker/build-push-action/issues/461
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+        uses: docker/setup-qemu-action@v3
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -68,15 +62,15 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
+      # Build and push Docker image with WarpBuild Docker builder
+      # https://docs.warpbuild.com/ci/docker-builders
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        uses: Warpbuilds/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64

Dockerfile.setup

@@ -0,0 +1,27 @@
+FROM alpine:3.18
+
+# Install required tools for configuration
+RUN apk update && apk add --no-cache \
+    bash \
+    curl \
+    wget \
+    jq \
+    git \
+    findutils \
+    coreutils \
+    grep \
+    sed \
+    gawk
+
+# Set working directory
+WORKDIR /app
+
+# Copy the configuration script
+COPY configure-environment.sh /app/
+COPY env.example /app/
+
+# Make the script executable
+RUN chmod +x /app/configure-environment.sh
+
+# Default command
+CMD ["bash", "-c", "echo 'Setup container ready. Run configure-environment.sh to setup environment.'"]

build-docker.sh

@@ -1 +1,14 @@
-docker build -t snapshotter-lite-v2 .
+docker build -t snapshotter-lite-v2 .
+
+#!/bin/bash
+
+# Build the setup image
+echo "🏗️ Building snapshotter-lite-setup image..."
+docker build -f Dockerfile.setup -t snapshotter-lite-setup:latest .
+
+if [ $? -eq 0 ]; then
+    echo "✅ Setup image built successfully"
+else
+    echo "❌ Failed to build setup image"
+    exit 1
+fi

build.sh

@@ -1,15 +1,70 @@
 #!/bin/bash
 
-# Run configuration
-source ./configure-environment.sh "$@"
-if [ $? -ne 0 ]; then
-    echo "❌ Configuration failed"
+# Parse arguments to check for dev mode and other flags
+DEV_MODE=false
+SETUP_ARGS=""
+
+for arg in "$@"; do
+    case $arg in
+        --dev-mode)
+            DEV_MODE=true
+            ;;
+        *)
+            SETUP_ARGS="$SETUP_ARGS $arg"
+            ;;
+    esac
+done
+
+# Build the setup container first
+echo "🏗️ Building setup container..."
+docker build -f Dockerfile.setup -t snapshotter-lite-setup:latest .
+
+# Create a temporary file to capture the env file path from setup
+SETUP_RESULT_FILE=$(mktemp)
+
+# Run setup container directly
+echo "🔧 Running setup container to configure environment..."
+docker run --rm -it \
+    -v "$(pwd):/app" \
+    -v "$SETUP_RESULT_FILE:/tmp/setup_result" \
+    -w /app \
+    snapshotter-lite-setup:latest \
+    bash -c "./configure-environment.sh $SETUP_ARGS --docker-mode"
+
+# Remove the setup container image
+docker rmi snapshotter-lite-setup:latest
+
+# Check if setup was successful by reading the result file
+if [ -f "$SETUP_RESULT_FILE" ] && [ -s "$SETUP_RESULT_FILE" ]; then
+    SELECTED_ENV_FILE=$(cat "$SETUP_RESULT_FILE")
+    rm -f "$SETUP_RESULT_FILE"
+    
+    if [ -n "$SELECTED_ENV_FILE" ] && [ -f "$SELECTED_ENV_FILE" ]; then
+        echo "ℹ️ Setup container configured: $SELECTED_ENV_FILE"
+    else
+        echo "❌ Setup container failed to report a valid env file."
+        echo "   Reported: '$SELECTED_ENV_FILE'"
+        echo "   This indicates a problem with the configuration process."
+        exit 1
+    fi
+else
+    echo "❌ Setup container did not complete successfully or failed to report results."
+    rm -f "$SETUP_RESULT_FILE"
     exit 1
 fi
 
+# Source the environment file to get variables
+source "$SELECTED_ENV_FILE"
+
+# Ensure FULL_NAMESPACE is available
+if [ -z "$FULL_NAMESPACE" ]; then
+    echo "❌ FULL_NAMESPACE not found in $SELECTED_ENV_FILE"
+    exit 1
+fi
 
-# Source the environment file
-source ".env-${FULL_NAMESPACE}"
+# Export variables so they're available to child scripts
+export FULL_NAMESPACE
+export NO_COLLECTOR
 
 if [ "$DEV_MODE" != "true" ]; then
     # Set image tag based on git branch
@@ -65,14 +120,14 @@ export FULL_NAMESPACE_LOWER
 
 COMPOSE_PROFILES="${COLLECTOR_PROFILE_STRING}"
 
-# Modify the deploy-services call to use the profiles
+# Modify the deploy-services call to use the profiles (setup already ran)
 if [ "$DEV_MODE" == "true" ]; then
-    ./deploy-services.sh --env-file ".env-${FULL_NAMESPACE}" \
+    ./deploy-services.sh --env-file "$SELECTED_ENV_FILE" \
         --project-name "$PROJECT_NAME_LOWER" \
         --collector-profile "$COMPOSE_PROFILES" \
         --dev-mode
 else
-    ./deploy-services.sh --env-file ".env-${FULL_NAMESPACE}" \
+    ./deploy-services.sh --env-file "$SELECTED_ENV_FILE" \
         --project-name "$PROJECT_NAME_LOWER" \
         --collector-profile "$COMPOSE_PROFILES" \
         --image-tag "$IMAGE_TAG"