chore: add make run target

Dockerfile

@@ -1,103 +1,21 @@
-FROM node:16.20-bullseye-slim as ui-build
-ARG TARGETARCH
-ARG NPM_REGISTRY="https://registry.npmmirror.com"
-ENV NPM_REGISTY=$NPM_REGISTRY
-
-RUN set -ex \
-    && npm config set registry ${NPM_REGISTRY} \
-    && yarn config set registry ${NPM_REGISTRY}
-
-WORKDIR /opt/kael/ui
-ADD ui/package.json ui/yarn.lock .
-RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=kael \
-    yarn install
-
-ADD ui .
-RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=kael \
-    yarn build
-
-FROM golang:1.21-bullseye as kael-build
-ARG TARGETARCH
+FROM golang:1.26-bookworm AS builder
 
 WORKDIR /opt/kael
-
-ADD go.mod go.sum .
-
-ARG GOPROXY=https://goproxy.io
-ENV CGO_ENABLED=0
-ENV GO111MODULE=on
-ENV GOOS=linux
-
-RUN --mount=type=cache,target=/root/.cache \
-    --mount=type=cache,target=/go/pkg/mod \
-    go mod download -x
-
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod go mod download
 COPY . .
+ARG VERSION=dev
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.Version=${VERSION}" -o /opt/kael/kael ./cmd/kael
 
-ARG VERSION
-ENV VERSION=$VERSION
-
-RUN --mount=type=cache,target=/root/.cache \
-    --mount=type=cache,target=/go/pkg/mod \
-    set +x \
-    && export GOFlAGS="-X 'main.Buildstamp=`date -u '+%Y-%m-%d %I:%M:%S%p'`'" \
-    && export GOFlAGS="$GOFlAGS -X 'main.Githash=`git rev-parse HEAD`'" \
-    && export GOFlAGS="${GOFlAGS} -X 'main.Goversion=`go version`'" \
-    && export GOFlAGS="$GOFlAGS -X 'main.Version=$VERSION'" \
-    && go build -ldflags "$GOFlAGS" -o kael ./cmd/kael \
-    && set -x && ls -al .
-
-RUN mkdir /opt/kael/release \
-    && chmod +x /opt/kael/entrypoint.sh \
-    && mv /opt/kael/entrypoint.sh /opt/kael/release
-
-FROM debian:bullseye-slim
-ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8
-
-ARG DEPENDENCIES="                    \
-        ca-certificates               \
-        curl                          \
-        git                           \
-        net-tools                     \
-        unzip                         \
-        vim                           \
-        locales                       \
-        wget"
-
-ARG APT_MIRROR=http://mirrors.ustc.edu.cn
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=kael \
-    sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
-    && rm -f /etc/apt/apt.conf.d/docker-clean \
-    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
-    && apt-get update \
-    && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
-    && sed -i "s@# export @export @g" ~/.bashrc \
-    && sed -i "s@# alias @alias @g" ~/.bashrc \
+FROM debian:bookworm-slim
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates \
     && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /opt
-
-ARG WISP_VERSION=v0.1.21
-RUN set -ex \
-    && wget https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
-    && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
-    && chown root:root /usr/local/bin/wisp \
-    && chmod 755 /usr/local/bin/wisp \
-    && rm -f /opt/*.tar.gz
-
 WORKDIR /opt/kael
-
-COPY --from=ui-build /opt/kael/ui/dist ./ui/dist
-COPY --from=kael-build /opt/kael/kael .
-COPY --from=kael-build /opt/kael/release .
-
-ARG VERSION
-ENV VERSION=$VERSION
-
+COPY --from=builder /opt/kael/kael ./kael
+COPY config_example.yml ./config_example.yml
+COPY entrypoint.sh ./entrypoint.sh
+RUN chmod 0755 ./entrypoint.sh ./kael
 EXPOSE 8083
-
-CMD ["./entrypoint.sh"]
+ENTRYPOINT ["./entrypoint.sh"]

Makefile

@@ -1,95 +1,23 @@
-NAME=kael
-BUILDDIR=build
+NAME := kael
+BUILD_DIR := build
+VERSION ?= dev
+RUN_ARGS ?=
+LDFLAGS := -s -w -X main.Version=$(VERSION)
 
-BASEPATH := $(shell pwd)
-BRANCH := $(shell git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3)
-BUILD := $(shell git rev-parse --short HEAD)
-KAELSRCFILE := $(BASEPATH)/cmd/kael/
-
-VERSION ?= $(BRANCH)-$(BUILD)
-BuildTime:= $(shell date -u '+%Y-%m-%d %I:%M:%S%p')
-COMMIT:= $(shell git rev-parse HEAD)
-GOVERSION:= $(shell go version)
-
-GOOS:=$(shell go env GOOS)
-GOARCH:=$(shell go env GOARCH)
-
-UIDIR=ui
-YARNINSTALL=yarn install
-YARNBUILD=yarn build
-
-LDFLAGS=-w -s
-
-KAELLDFLAGS+=-X 'main.Buildstamp=$(BuildTime)'
-KAELLDFLAGS+=-X 'main.Githash=$(COMMIT)'
-KAELLDFLAGS+=-X 'main.Goversion=$(GOVERSION)'
-
-KAELBUILD=CGO_ENABLED=0 go build -trimpath -ldflags "$(KAELLDFLAGS) ${LDFLAGS}"
-
-define make_artifact_full
-	GOOS=$(1) GOARCH=$(2) $(KAELBUILD) -o $(BUILDDIR)/$(NAME)-$(1)-$(2) $(KAELSRCFILE)
-	mkdir -p $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/$(UIDIR)/dist/
-	cp $(BUILDDIR)/$(NAME)-$(1)-$(2) $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/$(NAME)
-	-cp config_example.yml $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/config_example.yml
-	cp -r $(UIDIR)/dist/* $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/$(UIDIR)/dist/
-	cd $(BUILDDIR) && tar -czvf $(NAME)-$(VERSION)-$(1)-$(2).tar.gz $(NAME)-$(VERSION)-$(1)-$(2)
-	rm -rf $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2) $(BUILDDIR)/$(NAME)-$(1)-$(2)
-endef
+.PHONY: build run test clean docker
 
 build:
-	@echo "build kael"
-	GOARCH=$(GOARCH) GOOS=$(GOOS) $(KAELBUILD) -o $(BUILDDIR)/$(NAME) $(KAELSRCFILE)
-
-all: kael-ui
-	$(call make_artifact_full,darwin,amd64)
-	$(call make_artifact_full,darwin,arm64)
-	$(call make_artifact_full,linux,amd64)
-	$(call make_artifact_full,linux,arm64)
-	$(call make_artifact_full,linux,mips64le)
-	$(call make_artifact_full,linux,ppc64le)
-	$(call make_artifact_full,linux,s390x)
-	$(call make_artifact_full,linux,riscv64)
-
-local: kael-ui
-	$(call make_artifact_full,$(shell go env GOOS),$(shell go env GOARCH))
-
-darwin-amd64: kael-ui
-	$(call make_artifact_full,darwin,amd64)
-
-darwin-arm64: kael-ui
-	$(call make_artifact_full,darwin,arm64)
-
-linux-amd64: kael-ui
-	$(call make_artifact_full,linux,amd64)
-
-linux-arm64: kael-ui
-	$(call make_artifact_full,linux,arm64)
-
-linux-loong64: kael-ui
-	$(call make_artifact_full,linux,loong64)
-
-linux-mips64le: kael-ui
-	$(call make_artifact_full,linux,mips64le)
-
-linux-ppc64le: kael-ui
-	$(call make_artifact_full,linux,ppc64le)
-
-linux-s390x: kael-ui
-	$(call make_artifact_full,linux,s390x)
+	mkdir -p $(BUILD_DIR)
+	CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(NAME) ./cmd/kael
 
-linux-riscv64: kael-ui
-	$(call make_artifact_full,linux,riscv64)
+run:
+	go run ./cmd/kael $(RUN_ARGS)
 
-kael-ui:
-	@echo "build ui"
-	@cd $(UIDIR) && $(YARNINSTALL) && $(YARNBUILD)
+test:
+	go test ./...
 
-.PHONY: docker
 docker:
-	@echo "build docker images"
-	docker buildx build --build-arg VERSION=$(VERSION) -t jumpserver/kael .
+	docker buildx build --build-arg VERSION=$(VERSION) -t jumpserver/kael:$(VERSION) .
 
-.PHONY: clean
 clean:
-	-rm -rf $(BUILDDIR)
-	-rm -rf $(UIDIR)/dist/*
+	rm -rf $(BUILD_DIR)