Skip to content

Commit

Permalink
support-mips
Browse files Browse the repository at this point in the history
  • Loading branch information
yankay committed Dec 20, 2022
1 parent 1d98b08 commit d18359a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Dockerfile.nginx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d18359a

Please sign in to comment.