feat: improve Docker setup and multi-platform publishing

.env.example

@@ -1,3 +1,28 @@
+# Docker image versions
+TAG=latest                      # Version tag for masa-bittensor images
+PROTOCOL_VERSION=latest         # Version of masa-protocol to use
+
+# Network configuration
+NETWORK=test                    # Network to connect to (test/finney)
+NODE_ENV=production            # Node environment for protocol service
+
+# Port configuration
+PROTOCOL_PORT=8081             # Masa Protocol HTTP port
+P2P_PORT=4001                  # Masa Protocol P2P port
+VALIDATOR_PORT=8092            # Validator service port
+VALIDATOR_METRICS_PORT=8000    # Validator metrics port
+MINER_PORT=8093               # Miner service port
+MINER_METRICS_PORT=8001       # Miner metrics port
+
+# Bittensor wallet configuration
+COLDKEY_PASSWORD=your_coldkey_password    # Password for coldkey
+HOTKEY_PASSWORD=your_hotkey_password      # Password for hotkey
+
+# Optional: Advanced configuration
+# COLDKEY_MNEMONIC=                      # Mnemonic for coldkey regeneration (optional)
+# NETUID=42                              # Subnet ID (defaults to 42 for masa subnet)
+# PROTOCOL_URL=http://protocol:8081      # Internal URL for protocol service
+
 VALIDATOR_API_HOST=127.0.0.1
 VALIDATOR_API_PORT=8000
 ORACLE_BASE_URL=http://127.0.0.1:8080/api/v1

.env.sample

@@ -0,0 +1,18 @@
+# Number of miners to run (1-255)
+MINER_COUNT=1
+
+# Number of validators to run (0-255)
+VALIDATOR_COUNT=1
+
+# Your coldkey mnemonic (KEEP THIS SECURE!)
+# Example format: "word1 word2 word3 word4 ... word12"
+COLDKEY_MNEMONIC=""
+
+# Network to connect to (test/finney)
+NETWORK=test
+
+# Logging level (DEBUG/INFO/WARNING/ERROR)
+LOGGING_DEBUG=INFO
+
+# Optional: Custom docker image (leave empty to use latest from Docker Hub)
+# DOCKER_IMAGE=masaengineering/masa-bittensor:latest 

.github/workflows/docker-hub-description.yml

@@ -0,0 +1,26 @@
+name: Update Docker Hub Description
+
+on:
+  push:
+    branches:
+      - feature-docker-compose
+      - main
+    paths:
+      - 'DOCKER.md'
+      - '.github/workflows/docker-hub-description.yml'
+
+jobs:
+  docker-hub-description:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: masaengineering/masa-bittensor
+          short-description: "MASA Bittensor miners and validators in Docker"
+          readme-filepath: ./DOCKER.md 

.github/workflows/docker-publish.yml

@@ -1,90 +1,83 @@
-name: Docker Build and Publish
+name: 'Build and Publish Images to Docker Hub'
+
 on:
   push:
-    branches: [ "dockerize" ]
-  release:
-    types: [published]
+    branches:
+      - feature-docker-compose
+    tags:
+      - 'v*'  # Only trigger on version tags
 
 jobs:
-  check-and-build:
+  docker:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        image: [subtensor, subnet, miner, validator, protocol]
+    timeout-minutes: 240  # Increased timeout for ARM64 builds
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          fetch-depth: 0
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Cache last successful build info
-        uses: actions/cache@v3
+      # Tag generation with latest and release handling
+      - name: Generate Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          path: last_successful_build_${{ matrix.image }}.txt
-          key: ${{ runner.os }}-last-build-${{ matrix.image }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-last-build-${{ matrix.image }}-
+          images: masaengineering/masa-bittensor
+          tags: |
+            # Always push latest
+            type=raw,value=latest
+            # Branch builds with timestamp
+            type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
+            # SHA with timestamp
+            type=sha,format=short,prefix=sha-,suffix=-{{date 'YYYYMMDDHHmmss'}}
+            # Version tags (v1.2.3 -> 1.2.3, latest)
+            type=semver,pattern={{version}},value=${{ github.ref_name }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ github.ref_name }}
+            type=semver,pattern={{major}},value=${{ github.ref_name }}
 
-      - name: Check for changes
-        id: check_changes
+      # Debug step to see what tags will be used
+      - name: Debug Docker Tags
         run: |
-          if [ -f last_successful_build_${{ matrix.image }}.txt ]; then
-            LAST_SUCCESSFUL_SHA=$(cat last_successful_build_${{ matrix.image }}.txt)
-            if [ "${{ matrix.image }}" == "subtensor" ]; then
-              CHANGED=$(git diff --name-only $LAST_SUCCESSFUL_SHA HEAD -- docker/subtensor)
-            else
-              CHANGED=$(git diff --name-only $LAST_SUCCESSFUL_SHA HEAD -- docker/${{ matrix.image }} **/*.py)
-            fi
-
-            if [ -n "$CHANGED" ]; then
-              echo "Changes detected for ${{ matrix.image }}. Building image."
-              echo "changed=true" >> $GITHUB_OUTPUT
-            else
-              echo "No changes detected for ${{ matrix.image }}. Skipping build."
-              echo "changed=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "No previous successful build found for ${{ matrix.image }}. Building image."
-            echo "changed=true" >> $GITHUB_OUTPUT
-          fi
+          echo "Tags to be used:"
+          echo "${{ steps.meta.outputs.tags }}"
+          echo "Is this a release? ${{ startsWith(github.ref, 'refs/tags/v') }}"
 
-      - name: Log in to GitHub Container Registry
-        if: steps.check_changes.outputs.changed == 'true' || github.event_name == 'release'
-        uses: docker/login-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v5
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
-      - name: Build and push image
-        if: steps.check_changes.outputs.changed == 'true' || github.event_name == 'release'
+      # Verify the push was successful
+      - name: Verify Push
         run: |
-          if [ "${{ matrix.image }}" == "subtensor" ]; then
-            CONTEXT="./docker/subtensor"
-          else
-            CONTEXT="."
-          fi
-          TAG=${{ github.event_name == 'release' && github.event.release.tag_name || github.ref_name }}
-          docker build -t ghcr.io/masa-finance/masa-bittensor/${{ matrix.image }}:$TAG -f docker/${{ matrix.image }}/Dockerfile $CONTEXT
-          docker push ghcr.io/masa-finance/masa-bittensor/${{ matrix.image }}:$TAG
-
-      - name: Mark successful build
-        if: steps.check_changes.outputs.changed == 'true' || github.event_name == 'release'
-        run: echo ${{ github.sha }} > last_successful_build_${{ matrix.image }}.txt
+          echo "Verifying pushed images..."
+          for tag in $(echo "${{ steps.meta.outputs.tags }}" | tr '\n' ' '); do
+            echo "Checking tag: $tag"
+            docker pull $tag
+          done
 
-  display-tags:
-    needs: check-and-build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Display image tags
+      # Announce the release in the logs
+      - name: Announce Release
+        if: startsWith(github.ref, 'refs/tags/v')
         run: |
-          TAG=${{ github.event_name == 'release' && github.event.release.tag_name || github.ref_name }}
-          echo "The following images may have been built and pushed:"
-          echo "ghcr.io/masa-finance/masa-bittensor/subtensor:$TAG"
-          echo "ghcr.io/masa-finance/masa-bittensor/subnet:$TAG"
-          echo "ghcr.io/masa-finance/masa-bittensor/miner:$TAG"
-          echo "ghcr.io/masa-finance/masa-bittensor/validator:$TAG"
-          echo "ghcr.io/masa-finance/masa-bittensor/protocol:$TAG"
+          echo "🎉 Released version ${GITHUB_REF#refs/tags/v}"
+          echo "Published tags:"
+          echo "${{ steps.meta.outputs.tags }}"