feat: add Apple Silicon (M1/M2/M3) support - Update Dockerfiles for ARM64, fix build dependencies, use named volumes

Signed-off-by: Vishvendra <[email protected]>

Author: sangwaboi

Makefile

@@ -29,11 +29,25 @@ YELLOW := $(shell tput -Txterm setaf 3)
 RESET  := $(shell tput -Txterm sgr0)
 ARCH   := $(shell uname -m)
 
-# set the arm64 ARCH to amd64 for compatibility reason
+# Handle architecture detection and platform settings
 ifeq ($(ARCH), arm64)
-    ARCH := amd64
+    DOCKER_PLATFORM := linux/arm64
+    # Use ARM64 specific base images if available, fallback to multi-arch
+    DOCKER_BASE_arm64 := python:3.8-slim
+else ifeq ($(ARCH), x86_64)
+    DOCKER_PLATFORM := linux/amd64
+    DOCKER_BASE_amd64 := python:3.8-slim
+else
+    $(error "Architecture \"$(ARCH)\" is unsupported")
 endif
 
+# Set the base image based on architecture
+DOCKER_BASE := $(DOCKER_BASE_$(ARCH))
+BASE_VERSION ?= $(ARCH)-$(VERSION)
+
+# Add platform-specific build args
+DOCKER_BUILD_ARGS := --platform $(DOCKER_PLATFORM)
+
 #Set the source of PIP in docker agent image
 PIP=pip.conf.bak
 
@@ -72,10 +86,6 @@ COMMON_DOCKER_IMAGES = api-engine nginx dashboard
 AGENT_DOCKER_IMAGES = ansible kubernetes
 DUMMY = .$(IMG_TAG)
 
-ifeq ($(DOCKER_BASE), )
-	$(error "Architecture \"$(ARCH)\" is unsupported")
-endif
-
 # Frontend needed
 SLASH:=/
 REPLACE_SLASH:=\/
@@ -216,19 +226,16 @@ stop-docker-compose:
 images: api-engine docker-rest-agent fabric dashboard
 
 api-engine: 
-	docker build -t hyperledger/cello-api-engine:latest -f build_image/docker/common/api-engine/Dockerfile.in ./ --platform linux/$(ARCH)
+	docker build $(DOCKER_BUILD_ARGS) -t hyperledger/cello-api-engine:latest -f build_image/docker/common/api-engine/Dockerfile.in ./
 
 docker-rest-agent:
-	docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP) --platform linux/$(ARCH)
+	docker build $(DOCKER_BUILD_ARGS) -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP)
 
 fabric:
-	docker build -t hyperledger/fabric:2.5.10 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/
+	docker build $(DOCKER_BUILD_ARGS) -t hyperledger/fabric:2.5.10 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/
 
 dashboard:
-	docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./
-
-
-
+	docker build $(DOCKER_BUILD_ARGS) -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./
 
 .PHONY: \
 	all \

bootup/docker-compose-files/docker-compose.dev.yml

@@ -14,7 +14,7 @@ services:
     image: hyperledger/cello-dashboard
     container_name: cello-dashboard
     ports:
-      - "${DASHBOARD_SERVICE_PORT}:8081"
+      - "${DASHBOARD_SERVICE_PORT:-8081}:8081"
     networks:
       - cello-net
     depends_on:
@@ -32,7 +32,7 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ${CELLO_STORAGE_PATH:-/opt/cello}/pgdata:/var/lib/postgresql/data
+      - cello-postgres-data:/var/lib/postgresql/data
     networks:
       - cello-net
 
@@ -58,7 +58,7 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ${CELLO_STORAGE_PATH:-/opt/cello}:/opt/cello
+      - cello-api-engine-data:/opt/cello
     networks:
       - cello-net
     depends_on:
@@ -77,7 +77,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - DOCKER_URL=unix://var/run/docker.sock
-      - STORAGE_PATH=${CELLO_STORAGE_PATH:-/opt/cello}/hyperledger
+      - STORAGE_PATH=/opt/cello/hyperledger
     networks:
       - cello-net
 
@@ -86,7 +86,7 @@ networks:
     name: cello-net
 
 volumes:
-  cello-api-engine:
-  cello-postgres:
+  cello-postgres-data:
+  cello-api-engine-data:
   cello-dashboard:
   cello-docker-agent:

build_image/docker/agent/docker-rest-agent/Dockerfile.in

@@ -1,14 +1,28 @@
-FROM python:3.8
+FROM python:3.8-slim
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    python3-dev \
+    libev-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy requirements and pip config
 COPY src/agent/docker-rest-agent/requirements.txt /
-ARG pip=pip.conf.bak
+ARG pip=pip.conf
 COPY src/agent/docker-rest-agent/pip.conf /root/.pip/$pip
 
-RUN pip install -r /requirements.txt
-RUN mkdir -p /var/www/server
+# Install Python dependencies with pinned gevent version
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir "gevent==22.10.2" && \
+    pip install --no-cache-dir -r /requirements.txt
 
-COPY src/agent/docker-rest-agent/server.py /var/www/server
-COPY src/agent/docker-rest-agent/gunicorn.conf.py  /var/www/server
+# Create server directory and copy files
+RUN mkdir -p /var/www/server
+COPY src/agent/docker-rest-agent/server.py /var/www/server/
+COPY src/agent/docker-rest-agent/gunicorn.conf.py /var/www/server/
 
 WORKDIR /var/www/server
 
-CMD ["gunicorn", "server:app", "-c", "./gunicorn.conf.py"]
+# Run the server
+CMD ["gunicorn", "--config", "gunicorn.conf.py", "server:app"]

build_image/docker/common/api-engine/Dockerfile.in

@@ -1,8 +1,19 @@
-FROM python:3.8
+FROM python:3.8-slim
 
-# Install software
+# Install software including PostgreSQL development packages and pkg-config for pygraphviz
 RUN apt-get update \
-	&& apt-get install -y gettext-base graphviz libgraphviz-dev vim \
+	&& apt-get install -y \
+		gettext-base \
+		graphviz \
+		libgraphviz-dev \
+		pkg-config \
+		vim \
+		curl \
+		postgresql \
+		postgresql-client \
+		libpq-dev \
+		gcc \
+		python3-dev \
 	&& apt-get autoclean \
 	&& apt-get clean \
 	&& apt-get autoremove && rm -rf /var/cache/apt/
@@ -11,14 +22,23 @@ RUN apt-get update \
 WORKDIR /var/www/server
 
 # Install compiled code tools from Artifactory and copy it to opt folder.
-RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.10/hyperledger-fabric-linux-amd64-2.5.10.tar.gz" | tar xz -C /opt/
+# Use platform-specific Fabric binary
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+		curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.10/hyperledger-fabric-linux-arm64-2.5.10.tar.gz" | tar xz -C /opt/; \
+	else \
+		curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.10/hyperledger-fabric-linux-amd64-2.5.10.tar.gz" | tar xz -C /opt/; \
+	fi
 
 # Copy source code to the working dir
 COPY src/api-engine ./
 COPY template/node  /opt/node
 
 # Install python dependencies
-RUN	pip3 install -r requirements.txt
+# First upgrade pip to latest version
+RUN pip3 install --no-cache-dir --upgrade pip && \
+	pip3 install --no-cache-dir psycopg2-binary==2.8.4 && \
+	pip3 install --no-cache-dir -r requirements.txt
 
 # Add uwsgi configuration file
 COPY build_image/docker/common/api-engine/server.ini /etc/uwsgi/apps-enabled/