From d18359acd9c012db229508d906c03142131360ed Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Tue, 20 Dec 2022 15:41:00 +0800
Subject: [PATCH] support-mips

---
 Dockerfile.nginx | 10 +++++-----
 Makefile         |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.nginx b/Dockerfile.nginx
index b434ac2..627b0bc 100644
--- a/Dockerfile.nginx
+++ b/Dockerfile.nginx
@@ -1,11 +1,11 @@
 # Using a compact OS
-# FROM docker.m.daocloud.io/nginx:1.23.1-alpine
+# FROM nginx:1.23.1-alpine
 # ARG BASEIMAGE
 
-FROM docker.m.daocloud.io/nginx:1.23.3-alpine AS base-amd64
-FROM docker.m.daocloud.io/nginx:1.23.3-alpine AS base-arm64
-FROM docker.m.daocloud.io/nginx:1.23.3-alpine AS base-arm
-FROM docker.m.daocloud.io/mips64le/nginx:1.23.3 AS base-mips64le
+FROM nginx:1.23.3-alpine AS base-amd64
+FROM nginx:1.23.3-alpine AS base-arm64
+FROM nginx:1.23.3-alpine AS base-arm
+FROM mips64le/nginx:1.23.3 AS base-mips64le
 FROM cr.loongnix.cn/library/nginx:1.23.1-alpine AS base-loongnix
 
 FROM base-$TARGETARCH 
diff --git a/Makefile b/Makefile
index b111e8c..16767fd 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ IMAGE_ARCH:=$(REGISTRY)/dao-2048-$(MACHINE_TYPE):$(TAG)
 TRIVY_DB_REPOSITORY?=ghcr.io/aquasecurity/trivy-db
 
 TARGETS?=linux/arm,linux/arm64,linux/amd64,linux/mips64le
+TARGETS_STATIC?=linux/arm,linux/arm64,linux/amd64
 
 build-container: 
 	@echo "Build Image: $(IMAGE)"
@@ -89,11 +90,11 @@ cve-scan: build-container
 
 cross-build-container:
 	@docker buildx build  --platform $(TARGETS) -t "$(IMAGE_NGINX)" --file ./Dockerfile.nginx --build-arg BASEIMAGE=$(NGINX_BASEIMAGE) .
-	@docker buildx build  --platform $(TARGETS) -t "$(IMAGE_STATIC)" --file ./Dockerfile.static .
+	@docker buildx build  --platform $(TARGETS_STATIC) -t "$(IMAGE_STATIC)" --file ./Dockerfile.static .
 
 cross-release-container: cross-build-container
 	@docker buildx build  --platform $(TARGETS) -t "$(IMAGE_NGINX)" --push --file ./Dockerfile.nginx --build-arg BASEIMAGE=$(NGINX_BASEIMAGE) .
-	@docker buildx build  --platform $(TARGETS) -t "$(IMAGE_STATIC)" --push --file ./Dockerfile.static .
+	@docker buildx build  --platform $(TARGETS_STATIC) -t "$(IMAGE_STATIC)" --push --file ./Dockerfile.static .
 	@docker buildx build  --platform $(TARGETS) -t "$(IMAGE)" --push --file ./Dockerfile.nginx --build-arg BASEIMAGE=$(NGINX_BASEIMAGE) .
 
 GITHUB_OWNER?=daocloud