v5.0.0

.dockerignore

@@ -0,0 +1,9 @@
+.git
+.github
+.idea
+.vscode
+**/.DS_Store
+**/*.iml
+**/target
+data
+backend/web/src/main/resources/static

.github/workflows/jms-build-test.yml.disable

@@ -5,8 +5,6 @@ on:
       - 'Dockerfile'
       - 'Dockerfile*'
       - 'Dockerfile-*'
-      - 'frontend/package.json'
-      - 'frontend/yarn.lock'
 
 jobs:
   build:
@@ -21,7 +19,6 @@ jobs:
 
     - name: Prepare Build
       run: |
-        sed -i 's@registry.npmmirror.com@registry.yarnpkg.com@g' frontend/yarn.lock
         sed -i 's@^FROM registry.fit2cloud.com/jumpserver@FROM ghcr.io/jumpserver@g' Dockerfile-ee
 
     - name: Login to GitHub Container Registry
@@ -59,4 +56,4 @@ jobs:
           VERSION=${{ matrix.version }}
         outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
         cache-from: type=gha
-        cache-to: type=gha,mode=max
+        cache-to: type=gha,mode=max

.github/workflows/release-drafter.yml

@@ -12,8 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: [ '17' ]
-        node_version: [ '20' ]
+        java_version: [ '21' ]
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
@@ -22,7 +21,6 @@ jobs:
         with:
           path: |
             ~/.m2
-            ~/.npm
             ~/.cache
           key: ${{ runner.os }}-build-${{ github.sha }}
           restore-keys: ${{ runner.os }}-build-
@@ -43,20 +41,10 @@ jobs:
           version: ${{ steps.get_version.outputs.TAG }}
           tag: ${{ steps.get_version.outputs.TAG }}
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node_version }}
-
       - uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: ${{ matrix.java_version }}
-
-      - name: Build web
-        run: |
-          cd frontend
-          yarn install
-          yarn build
 
       - name: Build chen
         run: |

.vscode/launch.json

@@ -0,0 +1,12 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node-terminal",
+      "name": "Docker: Chen Backend",
+      "request": "launch",
+      "command": "docker compose up --build",
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

Dockerfile

@@ -1,24 +1,27 @@
-FROM jumpserver/chen-base:20260811_065334 AS stage-build
+FROM jumpserver/chen-base:20260821_111128 AS stage-build
 ENV LANG=en_US.UTF-8
 
 WORKDIR /opt/chen/
 COPY . .
 
-RUN cd frontend \
-    && npm run build
 
 RUN mvn clean package -Dmaven.test.skip=true
 
 FROM debian:trixie-slim
+ARG TARGETARCH
 
 ARG DEPENDENCIES="                    \
         ca-certificates               \
         openjdk-21-jre-headless"
 
 ARG APT_MIRROR=http://deb.debian.org
 
-RUN set -ex \
+# Dockerfile-ee uses the same per-architecture cache IDs for its extra packages.
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=chen-apt-cache-${TARGETARCH} \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked,id=chen-apt-lib-${TARGETARCH} \
+    set -ex \
     && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources \
+    && 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} \

Dockerfile-base

@@ -24,19 +24,12 @@ RUN set -ex \
     && dpkg -i check_linux_${TARGETARCH}.deb \
     && rm -f check_linux_${TARGETARCH}.deb
 
-ARG WISP_VERSION=v0.2.14
+ARG WISP_VERSION=v0.2.15
 RUN set -ex \
     && wget https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp_linux_${TARGETARCH}.deb \
     && dpkg -i wisp_linux_${TARGETARCH}.deb \
     && rm -f wisp_linux_${TARGETARCH}.deb
 
-# Install NPM dependencies
-WORKDIR /opt/chen/frontend
-COPY frontend/package.json frontend/package-lock.json frontend/yarn.lock ./
-
-RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=chen \
-    npm install
-
 # Install Maven dependencies
 ARG MAVEN_VERSION=3.9.16
 ARG USER_HOME_DIR="/root"
@@ -61,7 +54,6 @@ RUN set -ex \
     && rm -f /tmp/apache-maven.tar.gz \
     && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn \
     && mkdir -p /root/.m2 \
-    && mkdir -p /opt/chen/frontend/dist \
     && sed -i "s@https://repo.maven.apache.org/maven2@${MAVEN_MIRROR}@g" settings.xml \
     && cp -f settings.xml /root/.m2/ \
-    && mvn clean install
+    && mvn clean install

Dockerfile-ee

@@ -5,11 +5,11 @@ ARG TARGETARCH
 
 ARG DEPENDENCIES="                    \
         iputils-ping                  \
-        telnet"                   
+        telnet"
 
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=chen \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked,id=chen \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=chen-apt-cache-${TARGETARCH} \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked,id=chen-apt-lib-${TARGETARCH} \
     set -ex \
+    && rm -f /etc/apt/apt.conf.d/docker-clean \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES}
-

Dockerfile.wisp-dev

@@ -0,0 +1,52 @@
+# syntax=docker/dockerfile:1.7
+
+ARG GO_VERSION=1.25
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS stage-build
+
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG WISP_BUILD_PROCS=2
+ARG WISP_BUILD_MEMORY=1GiB
+
+ENV CGO_ENABLED=0
+WORKDIR /opt/wisp
+
+COPY --from=wisp-source go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod,sharing=locked \
+    GOMAXPROCS=${WISP_BUILD_PROCS} \
+    GOMEMLIMIT=${WISP_BUILD_MEMORY} \
+    go mod download
+
+COPY --from=wisp-source main.go ./
+COPY --from=wisp-source cmd ./cmd
+COPY --from=wisp-source pkg ./pkg
+COPY --from=wisp-source protobuf-go ./protobuf-go
+
+RUN --mount=type=cache,target=/go/pkg/mod,sharing=locked \
+    --mount=type=cache,target=/root/.cache/go-build,sharing=locked \
+    GOMAXPROCS=${WISP_BUILD_PROCS} \
+    GOMEMLIMIT=${WISP_BUILD_MEMORY} \
+    GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH} \
+    go build -p=${WISP_BUILD_PROCS} -trimpath -o /out/wisp .
+
+FROM debian:bookworm-slim
+
+ARG APT_MIRROR=http://deb.debian.org
+RUN set -ex \
+    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates netcat-openbsd \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/wisp
+COPY --from=stage-build /out/wisp ./wisp
+
+VOLUME ["/opt/wisp/data"]
+EXPOSE 9090
+
+HEALTHCHECK --interval=2s --timeout=1s --start-period=5s --retries=30 \
+    CMD ["nc", "-z", "127.0.0.1", "9090"]
+
+CMD ["./wisp"]

Makefile

@@ -0,0 +1,98 @@
+SHELL := /bin/bash
+.DEFAULT_GOAL := help
+.NOTPARALLEL:
+
+MAVEN ?= mvn
+LOCAL_REVISION ?= 0.0.1
+LOCAL_MAVEN_TEST_ARGS ?= -Dmaven.test.skip=true
+LOCAL_JAVA_HOME ?= $(shell if [[ -x /usr/libexec/java_home ]]; then /usr/libexec/java_home -v 21 2>/dev/null; elif [[ -n "$$JAVA_HOME" ]]; then printf '%s' "$$JAVA_HOME"; fi)
+LOCAL_JAVA_ENV := $(if $(strip $(LOCAL_JAVA_HOME)),JAVA_HOME="$(LOCAL_JAVA_HOME)")
+
+DOCKER_COMPOSE ?= docker compose
+COMPOSE_PARALLEL_LIMIT ?= 1
+WISP_IMAGE_REPOSITORY ?= ghcr.io/jumpserver/wisp
+WISP_BRANCH ?=
+export WISP_BRANCH
+WISP_TAG ?= $(shell ./scripts/resolve-wisp-tag.sh)
+WISP_IMAGE ?= $(WISP_IMAGE_REPOSITORY):$(WISP_TAG)
+WISP_PULL_POLICY ?= missing
+
+export COMPOSE_PARALLEL_LIMIT
+export WISP_IMAGE_REPOSITORY
+export WISP_TAG
+export WISP_IMAGE
+export WISP_PULL_POLICY
+export WISP_SOURCE
+
+DEV_COMPOSE_FILES := -f docker-compose.yml -f docker-compose.wisp-dev.yml
+ifneq ($(strip $(WISP_SOURCE)),)
+DEV_COMPOSE_FILES += -f docker-compose.wisp-source.yml
+endif
+DEV_COMPOSE := $(DOCKER_COMPOSE) $(DEV_COMPOSE_FILES)
+
+.PHONY: help dev run dev-run dev-up dev-wisp dev-wisp-image dev-logs dev-ps dev-config dev-down proto-sync
+
+help:
+	@printf '%s\n' \
+		'Chen development commands:' \
+		'  make dev                 Build and run Chen locally' \
+		'  make run                 Run Chen and Wisp with Compose in the foreground' \
+		'  make dev-up              Build and run in the background' \
+		'  make dev-wisp            Rebuild/recreate only Wisp' \
+		'  make dev-wisp-image      Show the resolved Wisp image' \
+		'  make dev-logs            Follow Chen and Wisp logs' \
+		'  make dev-ps              Show development services' \
+		'  make dev-config          Render the merged Compose configuration' \
+		'  make dev-down            Stop and remove development services' \
+		'  make proto-sync          Copy generated Java protobuf files from Wisp' \
+		'' \
+		'Wisp source mode:' \
+		'  make run WISP_SOURCE=/absolute/path/to/wisp' \
+		'' \
+		'Wisp image mode:' \
+		'  Wisp tag defaults to the current Chen tracking branch' \
+		'  make run WISP_TAG=latest' \
+		'  make run WISP_IMAGE=registry/wisp:tag WISP_PULL_POLICY=always'
+
+run: dev-run
+	@:
+
+dev-run:
+	@$(DEV_COMPOSE) up --build
+
+dev:
+	@$(LOCAL_JAVA_ENV) $(MAVEN) -U \
+		-Drevision=$(LOCAL_REVISION) \
+		$(LOCAL_MAVEN_TEST_ARGS) \
+		-Dmaven.antrun.skip=true \
+		clean org.codehaus.mojo:flatten-maven-plugin:1.6.0:flatten install
+	@cd backend/web && $(LOCAL_JAVA_ENV) $(MAVEN) \
+		-Drevision=$(LOCAL_REVISION) \
+		$(LOCAL_MAVEN_TEST_ARGS) \
+		spring-boot:run \
+		-Dmaven.antrun.skip=true \
+		-Dspring-boot.run.arguments="--spring.config.additional-location=file:$(CURDIR)/config/ --driver.driver-path=$(CURDIR)/drivers"
+
+dev-up:
+	@$(DEV_COMPOSE) up -d --build
+
+dev-wisp:
+	@$(DEV_COMPOSE) up -d --build --no-deps wisp
+
+dev-wisp-image:
+	@printf '%s\n' '$(WISP_IMAGE)'
+
+dev-logs:
+	@$(DEV_COMPOSE) logs -f chen-backend wisp
+
+dev-ps:
+	@$(DEV_COMPOSE) ps
+
+dev-config:
+	@$(DEV_COMPOSE) config
+
+dev-down:
+	@$(DEV_COMPOSE) down
+
+proto-sync:
+	@./scripts/sync-wisp-proto.sh