Skip to content

Commit

Permalink
ci: support uploading images of arm architecture (#545)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlinsRan authored Feb 22, 2024
1 parent da7252d commit 2ddd304
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ push-multiarch-dev-on-debian:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --network=host --push \
-t $(IMAGE_NAME):dev \
--platform linux/amd64 \
--platform linux/amd64,linux/arm64 \
-f ./debian-dev/Dockerfile debian-dev
@$(call func_echo_success_status, "$@ -> [ Done ]")

Expand All @@ -124,7 +124,7 @@ push-multiarch-on-debian:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --network=host --push \
-t $(ENV_APISIX_IMAGE_TAG_NAME)-debian \
--platform linux/amd64 \
--platform linux/amd64,linux/arm64 \
-f ./debian/Dockerfile debian
@$(call func_echo_success_status, "$@ -> [ Done ]")

Expand All @@ -135,7 +135,7 @@ push-multiarch-on-redhat:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --network=host --push \
-t $(ENV_APISIX_IMAGE_TAG_NAME)-redhat \
--platform linux/amd64 \
--platform linux/amd64,linux/arm64 \
-f ./redhat/Dockerfile redhat
@$(call func_echo_success_status, "$@ -> [ Done ]")

Expand All @@ -149,7 +149,7 @@ push-multiarch-on-latest:
@if [ "$(shell echo "$(APISIX_VERSION) $(MAX_APISIX_VERSION)" | tr " " "\n" | sort -rV | head -n 1)" == "$(APISIX_VERSION)" ]; then \
$(ENV_DOCKER) buildx build --network=host --push \
-t $(IMAGE_NAME):latest \
--platform linux/amd64 \
--platform linux/amd64,linux/arm64 \
-f ./debian/Dockerfile debian; \
fi
@$(call func_echo_success_status, "$@ -> [ Done ]")
Expand Down
2 changes: 2 additions & 0 deletions all-in-one/apisix-dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ COPY --from=pre-build /usr/local/apisix-dashboard .
WORKDIR /usr/local/apisix-dashboard/web

RUN if [ "$ENABLE_PROXY" = "true" ] ; then yarn config set registry https://registry.npmmirror.com/ ; fi \
# FIXME: when the certificate is valid
&& yarn config set "strict-ssl" false -g \
&& yarn install \
&& yarn build

Expand Down

0 comments on commit 2ddd304

Please sign in to comment.