update CI

luoluoyuyu · luoluoyuyu · commit 14a1522226c5 · 2026-02-04T23:32:34.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/verify-package.yml b/.github/workflows/verify-package.yml
@@ -0,0 +1,89 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Package Verification
+
+on:
+  push:
+    branches: ["main", "master"]
+  pull_request:
+    branches: ["main", "master"]
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build-and-package:
+    name: Build & Dist Check
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: "pip"
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            cmake \
+            libssl-dev \
+            pkg-config \
+            libsasl2-dev \
+            protobuf-compiler
+
+      - name: Cache Cargo
+        uses: Swatinem/rust-cache@v2
+
+      - name: Initialize Environment
+        run: make env
+
+      - name: Check Formatting
+        run: cargo fmt --all -- --check
+
+      - name: Run Clippy
+        run: cargo clippy --all-targets --workspace -- -D warnings
+
+      - name: Run Unit Tests
+        run: make test
+
+      - name: Build & Package (Full)
+        run: make dist
+
+      - name: Build & Package (Lite)
+        run: make dist-lite
+
+      - name: Verify Artifacts
+        run: |
+          ls -lh dist/*.tar.gz dist/*.zip
+          test -f dist/function-stream-*.tar.gz
+          test -f dist/function-stream-*-lite.tar.gz
+
+      - name: Upload Packages
+        uses: actions/upload-artifact@v4
+        if: success()
+        with:
+          name: dist-packages
+          path: dist/*.tar.gz
+          retention-days: 1
diff --git a/Dockerfile b/Dockerfile
@@ -1,58 +1,75 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# syntax=docker/dockerfile:1
+
 FROM rust:1-bookworm AS builder
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    cmake=3.25.1-1 \
-    make \
-    clang=1:14.0-55.7~deb12u1 \
-    libclang-dev=1:14.0-55.7~deb12u1 \
-    python3 \
-    python3-venv \
-    python3-pip \
+    cmake \
+    clang \
+    libclang-dev \
     libssl-dev \
     pkg-config \
     libsasl2-dev \
     protobuf-compiler \
+    python3-full \
+    python3-pip \
+    python3-venv \
     && rm -rf /var/lib/apt/lists/*
 
-ENV PROTOC=/usr/bin/protoc
+WORKDIR /workspace
 
-WORKDIR /build
+COPY Cargo.toml Cargo.lock Makefile ./
+COPY scripts ./scripts
+COPY python ./python
+COPY wit ./wit
+
+RUN bash scripts/setup.sh
 
-COPY Makefile Cargo.toml Cargo.lock ./
 COPY protocol ./protocol
 COPY cli ./cli
 COPY src ./src
-COPY python ./python
-COPY wit ./wit
-COPY conf/config.yaml ./
+COPY conf ./conf
 
-RUN python3 -m venv .venv \
-    && .venv/bin/pip install --upgrade pip \
-    && .venv/bin/pip install componentize-py \
-    && .venv/bin/pip install -e python/functionstream-api
-
-WORKDIR /build/python/functionstream-runtime
 RUN make build
-WORKDIR /build
 
-RUN make build-full
+FROM debian:bookworm-slim AS runtime
 
-FROM debian:bookworm-slim
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates=20230311+deb12u1 \
-    libssl3=3.0.18-1~deb12u2 \
+    ca-certificates \
+    libssl3 \
+    libsasl2-2 \
     && rm -rf /var/lib/apt/lists/*
 
+RUN groupadd -g 1000 appgroup && \
+    useradd -m -u 1000 -g appgroup -s /bin/bash appuser
+
 WORKDIR /app
 
-COPY --from=builder /build/target/release/function-stream bin/
-COPY --from=builder \
-    /build/python/functionstream-runtime/target/functionstream-python-runtime.wasm \
+COPY --from=builder --chown=appuser:appgroup /workspace/target/release/function-stream bin/
+COPY --from=builder --chown=appuser:appgroup \
+    /workspace/python/functionstream-runtime/target/functionstream-python-runtime.wasm \
     data/cache/python-runner/
-COPY conf/config.yaml conf/
+COPY --from=builder --chown=appuser:appgroup /workspace/conf/config.yaml conf/
+
 RUN sed -i 's/127.0.0.1/0.0.0.0/' conf/config.yaml
 
+USER appuser
 EXPOSE 8080
+VOLUME ["/app/data", "/app/logs"]
 
 ENTRYPOINT ["./bin/function-stream"]
diff --git a/Makefile b/Makefile
@@ -29,6 +29,10 @@ LITE_NAME   := $(APP_NAME)-$(VERSION)-lite
 FULL_PATH   := $(DIST_ROOT)/$(FULL_NAME)
 LITE_PATH   := $(DIST_ROOT)/$(LITE_NAME)
 
+DOCKER_REPO := functionstream
+DOCKER_TAG  := $(VERSION)
+IMAGE_NAME  := $(DOCKER_REPO):$(DOCKER_TAG)
+
 C_R := \033[0;31m
 C_G := \033[0;32m
 C_B := \033[0;34m
@@ -38,7 +42,7 @@ C_0 := \033[0m
 log = @printf "$(C_B)[-]$(C_0) %-15s %s\n" "$(1)" "$(2)"
 success = @printf "$(C_G)[✔]$(C_0) %s\n" "$(1)"
 
-.PHONY: all help build build-lite dist dist-lite clean test env env-clean .check-env .build-wasm
+.PHONY: all help build build-lite dist dist-lite clean test env env-clean docker docker-run docker-push .check-env .build-wasm
 
 all: build
 
@@ -52,6 +56,9 @@ help:
 	@echo "  env         Setup Python dev environment (.venv)"
 	@echo "  test        Run unit tests"
 	@echo "  clean       Cleanup all artifacts"
+	@echo "  docker      Build Docker image"
+	@echo "  docker-run  Run container (port 8080, mount logs)"
+	@echo "  docker-push Push image to registry"
 	@echo ""
 	@echo "  Version: $(VERSION) | Arch: $(ARCH) | OS: $(OS)"
 
@@ -122,3 +129,20 @@ clean:
 .check-env:
 	@command -v cargo >/dev/null 2>&1 || { printf "$(C_R)[X] Cargo not found$(C_0)\n"; exit 1; }
 	@command -v python3 >/dev/null 2>&1 || { printf "$(C_R)[X] Python3 not found$(C_0)\n"; exit 1; }
+
+docker:
+	$(call log,DOCKER,Building Image: $(IMAGE_NAME))
+	@docker build -t $(IMAGE_NAME) .
+	$(call success,Image Ready: $(IMAGE_NAME))
+
+docker-run:
+	$(call log,DOCKER,Starting Container)
+	@docker run --rm -it \
+		-p 8080:8080 \
+		-v $(CURDIR)/logs:/app/logs \
+		$(IMAGE_NAME)
+
+docker-push:
+	$(call log,DOCKER,Pushing $(IMAGE_NAME))
+	@docker push $(IMAGE_NAME)
+	$(call success,Push Complete)
