Fix Elrond ARM image creation

Signed-off-by: Stavros Foteinopoulos <[email protected]>

Makefile

@@ -4,7 +4,7 @@
 
 ## Docker Build Versions
 DOCKER_BUILD_IMAGE = golang:1.20
-DOCKER_BASE_IMAGE = alpine:3.15.4
+DOCKER_BASE_IMAGE = alpine:3.19
 
 ################################################################################
 
@@ -65,14 +65,27 @@ binaries: ## Build binaries of elrond
 .PHONY: build
 build: ## Build the elrond
 	@echo Building Elrond
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -ldflags '$(LDFLAGS)' -gcflags all=-trimpath=$(PWD) -asmflags all=-trimpath=$(PWD) -a -installsuffix cgo -o build/_output/bin/elrond  ./cmd/$(APP)
+	@echo Building Mattermost-Cloud for ARCH=$(ARCH)
+	@if [ "$(ARCH)" = "amd64" ]; then \
+		export GOARCH="amd64"; \
+	elif [ "$(ARCH)" = "arm64" ]; then \
+		export GOARCH="arm64"; \
+	elif [ "$(ARCH)" = "arm" ]; then \
+		export GOARCH="arm"; \
+	else \
+		echo "Unknown architecture $(ARCH)"; \
+		exit 1; \
+	fi; \
+	GOOS=linux CGO_ENABLED=0 $(GO) build -ldflags '$(LDFLAGS)' -gcflags all=-trimpath=$(PWD) -asmflags all=-trimpath=$(PWD) -a -installsuffix cgo -o build/_output/bin/elrond  ./cmd/$(APP)
 
 .PHONY: build-image
 build-image:  ## Build the docker image for Elrond
 	@echo Building Elrond Docker Image
-	: $${DOCKER_USERNAME:?}
-	: $${DOCKER_PASSWORD:?}
-	echo $(DOCKER_PASSWORD) | docker login --username $(DOCKER_USERNAME) --password-stdin
+	@if [ -z "$(DOCKER_USERNAME)" ] || [ -z "$(DOCKER_PASSWORD)" ]; then \
+		echo "DOCKER_USERNAME and/or DOCKER_PASSWORD not set. Skipping Docker login."; \
+	else \
+		echo $(DOCKER_PASSWORD) | docker login --username $(DOCKER_USERNAME) --password-stdin; \
+	fi
 	docker buildx build \
 	--platform linux/arm64,linux/amd64 \
 	--build-arg DOCKER_BUILD_IMAGE=$(DOCKER_BUILD_IMAGE) \
@@ -84,10 +97,12 @@ build-image:  ## Build the docker image for Elrond
 .PHONY: build-image-with-tag
 build-image-with-tag:  ## Build the docker image for elrond
 	@echo Building Elrond Docker Image
-	: $${DOCKER_USERNAME:?}
-	: $${DOCKER_PASSWORD:?}
+	@if [ -z "$(DOCKER_USERNAME)" ] || [ -z "$(DOCKER_PASSWORD)" ]; then \
+		echo "DOCKER_USERNAME and/or DOCKER_PASSWORD not set. Skipping Docker login."; \
+	else \
+		echo $(DOCKER_PASSWORD) | docker login --username $(DOCKER_USERNAME) --password-stdin; \
+	fi
 	: $${TAG:?}
-	echo $(DOCKER_PASSWORD) | docker login --username $(DOCKER_USERNAME) --password-stdin
 	docker buildx build \
 	--platform linux/arm64,linux/amd64 \
 	--build-arg DOCKER_BUILD_IMAGE=$(DOCKER_BUILD_IMAGE) \

build/Dockerfile

@@ -1,12 +1,23 @@
 # Build the Mattermost Elrond
 ARG DOCKER_BUILD_IMAGE=golang:1.20
-ARG DOCKER_BASE_IMAGE=alpine:3.16.2
+ARG DOCKER_BASE_IMAGE=alpine:3.19
 
 FROM ${DOCKER_BUILD_IMAGE} AS build
 WORKDIR /elrond/
 COPY . /elrond/
+
+# Detect architecture and set ARCH
+RUN ARCH=$(uname -m) && \
+    if [ "$ARCH" = "x86_64" ]; then \
+        ARCH="amd64"; \
+    elif [ "$ARCH" = "aarch64" ]; then \
+        ARCH="arm64"; \
+    elif [ "$ARCH" = "armv7l" ] || [ "$ARCH" = "armv6l" ]; then \
+        ARCH="arm"; \
+    fi && \
+    echo "ARCH=$ARCH" && \
+    make build ARCH=$ARCH
 RUN apt-get update -yq && apt-get install -yq unzip
-RUN make build
 
 
 # Final Image
@@ -24,7 +35,7 @@ ENV ELROND=/elrond/elrond \
     USER_NAME=elrond
 
 RUN  apk update && apk add libc6-compat && apk add ca-certificates
-COPY --from=build /elrond/build/_output/bin/elrond /elrond/elrond
+COPY --from=build /elrond/cmd/elrond /elrond/elrond
 COPY --from=build /elrond/build/bin /usr/local/bin
 
 RUN  /usr/local/bin/user_setup