From 07ab0bc5a1ab0ef34ea44aaae2158f983fd1af66 Mon Sep 17 00:00:00 2001 From: RockYang Date: Thu, 7 Dec 2023 15:44:20 +0800 Subject: [PATCH] docs: add arm64 build script --- api/Makefile | 19 +++++++------------ build/build.sh | 20 +++++++++++--------- build/dockerfile-api-go | 2 +- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/api/Makefile b/api/Makefile index 6fd7b66a..deafd9ff 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,19 +1,14 @@ SHELL=/usr/bin/env bash NAME := chatgpt-plus -all: window linux darwin +all: amd64 arm64 +amd64: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/$(NAME)-linux main.go +.PHONY: amd64 -window: - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o bin/$(NAME)-amd64.exe main.go -.PHONY: window - -linux: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/$(NAME)-amd64-linux main.go -.PHONY: linux - -darwin: - CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o bin/$(NAME)-amd64-darwin main.go -.PHONY: darwin +arm64: + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 GOARM=7 go build -o bin/$(NAME)-linux main.go +.PHONY: arm64 clean: rm -rf bin/$(NAME)-* diff --git a/build/build.sh b/build/build.sh index 55d43027..a1d37431 100755 --- a/build/build.sh +++ b/build/build.sh @@ -1,9 +1,11 @@ #!/bin/bash version=$1 -# build go api +arch=${2:-amd64} + +# build go api program cd ../api -make clean linux +make clean $arch # build web app cd ../web @@ -12,15 +14,15 @@ npm run build cd ../build # remove docker image if exists -docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:$version +docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:$version-$arch # build docker image for chatgpt-plus-go -docker build -t registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:$version -f dockerfile-api-go ../ +docker build -t registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:$version-$arch -f dockerfile-api-go ../ # build docker image for chatgpt-plus-vue -docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:$version -docker build --platform linux/amd64 -t registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:$version -f dockerfile-vue ../ +docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:$version-$arch +docker build --platform linux/amd64 -t registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:$version-$arch -f dockerfile-vue ../ -if [ "$2" = "push" ];then - docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:$version - docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:$version +if [ "$3" = "push" ];then + docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:$version-$arch + docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:$version-$arch fi diff --git a/build/dockerfile-api-go b/build/dockerfile-api-go index 1e9262c5..a911e27d 100644 --- a/build/dockerfile-api-go +++ b/build/dockerfile-api-go @@ -4,7 +4,7 @@ FROM alpine:3.18.2 MAINTAINER yangjian WORKDIR /var/www/app -COPY ./api/bin/chatgpt-plus-amd64-linux /var/www/app +COPY ./api/bin/chatgpt-plus-linux /var/www/app EXPOSE 5678