Merge branch 'alpha' into beta

Dockerfile

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:experimental
+
 # build frontend
 FROM node:19-alpine as frontend
 ARG API_HOST

Makefile

@@ -17,7 +17,7 @@ RELEASE_DARWIN_AMD64 = $(RELEASE_ROOT)/darwin-amd64/$(TARGET)
 RELEASE_DARWIN_ARM64 = $(RELEASE_ROOT)/darwin-arm64/$(TARGET)
 RELEASE_WINDOWS_AMD64 = $(RELEASE_ROOT)/windows-amd64/$(TARGET)
 
-BUILD_VERSION := $(shell git describe --tags | cut -f 1 -d "-")
+BUILD_VERSION := $(shell git describe --tags --always | cut -f1 -f2 -d "-")
 BUILD_DATE := $(shell date +'%Y-%m-%d %H:%M:%S')
 SHA_SHORT := $(shell git rev-parse --short HEAD)
 
@@ -51,22 +51,22 @@ release: linux-amd64 darwin-amd64 darwin-arm64 windows-x64
 
 .PHONY: linux-amd64
 linux-amd64:
-	@echo Build paopao-ce [linux-amd64] CGO_ENABLED=$(CGO_ENABLED)
+	@echo Build paopao-ce [linux-amd64] CGO_ENABLED=$(CGO_ENABLED) TAGS="'$(TAGS)'"
 	@CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=amd64 go build -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(RELEASE_LINUX_AMD64)/$(TARGET_BIN)
 
 .PHONY: darwin-amd64
 darwin-amd64:
-	@echo Build paopao-ce [darwin-amd64] CGO_ENABLED=$(CGO_ENABLED)
+	@echo Build paopao-ce [darwin-amd64] CGO_ENABLED=$(CGO_ENABLED) TAGS="'$(TAGS)'"
 	@CGO_ENABLED=$(CGO_ENABLED) GOOS=darwin GOARCH=amd64 go build -trimpath  -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(RELEASE_DARWIN_AMD64)/$(TARGET_BIN)
 
 .PHONY: darwin-arm64
 darwin-arm64:
-	@echo Build paopao-ce [darwin-arm64] CGO_ENABLED=$(CGO_ENABLED)
+	@echo Build paopao-ce [darwin-arm64] CGO_ENABLED=$(CGO_ENABLED) TAGS="'$(TAGS)'"
 	@CGO_ENABLED=$(CGO_ENABLED) GOOS=darwin GOARCH=arm64 go build -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(RELEASE_DARWIN_ARM64)/$(TARGET_BIN)
 
 .PHONY: windows-x64
 windows-x64:
-	@echo Build paopao-ce [windows-x64] CGO_ENABLED=$(CGO_ENABLED)
+	@echo Build paopao-ce [windows-x64] CGO_ENABLED=$(CGO_ENABLED) TAGS="'$(TAGS)'"
 	@CGO_ENABLED=$(CGO_ENABLED) GOOS=windows GOARCH=amd64 go build -trimpath  -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(RELEASE_WINDOWS_AMD64)/$(TARGET_BIN).exe
 
 .PHONY: generate

build-image.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# eg.1 : sh build-image.sh
+# eg.2, set image: sh build-image.sh bitbus/paopao-ce
+
+VERSION=`git describe --tags --always | cut -f1 -f2 -d "-"` # eg.: 0.2.5
+IMAGE="bitbus/paopao-ce"
+
+if [ -n "$1" ]; then
+  IMAGE="$1"
+fi
+if [ -n "$2" ]; then
+  VERSION="$2"
+fi
+
+# build image
+docker buildx build \
+  --build-arg USE_DIST="yes" \
+  --tag "$IMAGE:${VERSION}" \
+  --tag "$IMAGE:latest" \
+  . -f Dockerfile
+
+# push to image rep
+# if [ -n "$1" ]; then
+#   docker push "$IMAGE:${VERSION}"
+#   docker push "$IMAGE:latest"
+# fi

build-release.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+# eg.1 : sh build-image.sh
+# eg.2, set tags: sh build-image.sh 'embed go_json'
+
+TAGS='embed go_json'
+
+if [ -n "$1" ]; then
+  TAGS="$1"
+fi
+
+make release CGO_ENABLED=0 TAGS="$TAGS"