criyle · Mar 28, 2024 · Jun 12, 2024 · Sep 22, 2024 · Sep 22, 2024 · Sep 22, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -29,4 +29,4 @@ node_modules
 package*.json
 
 example.js
-/go-judge*
+#/go-judge*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,21 +16,21 @@ jobs:
           fetch-depth: 0
       - name: Fetch all tags
         run: git fetch --force --tags
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+     # - name: Set up QEMU
+     #   uses: docker/setup-qemu-action@v3
+     # - name: Set up Docker Buildx
+     #   uses: docker/setup-buildx-action@v3
+     # - name: Login to DockerHub
+     #   uses: docker/login-action@v3
+     #   with:
+     #     username: ${{ secrets.DOCKERHUB_USERNAME }}
+     #     password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         if: ${{ contains(github.ref, 'v') }}
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
@@ -40,7 +40,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Test GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         if: ${{ ! contains(github.ref, 'v') }}
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
@@ -53,9 +53,9 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-latest
+         # - windows-latest
           - ubuntu-latest
-          - macos-latest
+         # - macos-latest
         GOARCH:
           - amd64
         include:
@@ -72,10 +72,10 @@ jobs:
     steps:
       - name: Check out
         uses: actions/checkout@v4
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Get git tag ref
         run: git fetch --prune --unshallow --tags
       - name: Download dependencies

diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,7 @@ cmd/go-judge/version/version.txt
 
 dist/
 .vscode
+
+# IDE
+.idea/
+polaris/
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,6 +1,7 @@
 # This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com
 project_name: go-judge
+version: 2
 before:
   hooks:
     # You may remove this if you don't use go modules.
@@ -13,8 +14,6 @@ builds:
       - CGO_ENABLED=0
     goos:
       - linux
-      - windows
-      - darwin
     goarch:
       - "386"
       - amd64
@@ -60,85 +59,10 @@ nfpms:
 # nix:
 #   - name: go-judge
 #     license: "mit"
-dockers:
-  - image_templates:
-    - "criyle/go-judge:{{ .Tag }}-amd64"
-    use: buildx
-    dockerfile: "Dockerfile.goreleaser"
-    goarch: amd64
-    extra_files:
-      - "mount.yaml"
-    build_flag_templates:
-      - "--platform=linux/amd64"
-  - image_templates:
-    - "criyle/go-judge:{{ .Tag }}-arm64"
-    use: buildx
-    goarch: "arm64"
-    dockerfile: "Dockerfile.goreleaser"
-    extra_files:
-      - "mount.yaml"
-    build_flag_templates:
-      - "--platform=linux/arm64"
-  - image_templates:
-    - "criyle/go-judge:{{ .Tag }}-arm"
-    use: buildx
-    goarch: "arm"
-    goarm: "7"
-    dockerfile: "Dockerfile.goreleaser"
-    extra_files:
-      - "mount.yaml"
-    build_flag_templates:
-      - "--platform=linux/arm/v7"
-  - image_templates:
-    - "criyle/go-judge:{{ .Tag }}-ppc64le"
-    use: buildx
-    dockerfile: "Dockerfile.goreleaser"
-    goarch: ppc64le
-    extra_files:
-      - "mount.yaml"
-    build_flag_templates:
-      - "--platform=linux/ppc64le"
-  - image_templates:
-      - "criyle/go-judge:{{ .Tag }}-s390x"
-    use: buildx
-    dockerfile: "Dockerfile.goreleaser"
-    goarch: s390x
-    extra_files:
-      - "mount.yaml"
-    build_flag_templates:
-      - "--platform=linux/s390x"
-  # Debian is not supporting riscv64 on stable branch, skip it first
-  # - image_templates:
-  #   - "criyle/go-judge:{{ .Tag }}-riscv64"
-  #   use: buildx
-  #   dockerfile: "Dockerfile.goreleaser"
-  #   goarch: riscv64
-  #   extra_files:
-  #     - "mount.yaml"
-  #   build_flag_templates:
-  #     - "--platform=linux/riscv64"
-docker_manifests:
-  - name_template: "criyle/go-judge:{{ .Tag }}"
-    image_templates:
-      - "criyle/go-judge:{{ .Tag }}-amd64"
-      - "criyle/go-judge:{{ .Tag }}-arm64"
-      - "criyle/go-judge:{{ .Tag }}-arm"
-      - "criyle/go-judge:{{ .Tag }}-ppc64le"
-      - "criyle/go-judge:{{ .Tag }}-s390x"
-      # - "criyle/go-judge:{{ .Tag }}-riscv64"
-  - name_template: "criyle/go-judge:latest"
-    image_templates:
-      - "criyle/go-judge:{{ .Tag }}-amd64"
-      - "criyle/go-judge:{{ .Tag }}-arm64"
-      - "criyle/go-judge:{{ .Tag }}-arm"
-      - "criyle/go-judge:{{ .Tag }}-ppc64le"
-      - "criyle/go-judge:{{ .Tag }}-s390x"
-      # - "criyle/go-judge:{{ .Tag }}-riscv64"
-    skip_push: auto
 checksum:
   name_template: "checksums.txt"
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 changelog:
   sort: asc
   filters:
@@ -147,5 +71,5 @@ changelog:
       - "^test:"
 release:
   github:
-    owner: criyle
+    owner: knife-fish
     name: go-judge
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,11 @@
+FROM ubuntu:latest
+
+ENV TZ=Etc/UTC
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.aliyun.com@g" /etc/apt/sources.list && \
+    sed -i "s@http://.*security.ubuntu.com@http://mirrors.aliyun.com@g" /etc/apt/sources.list
+RUN apt-get -y update && apt-get -y install vim curl gcc g++ python3 python3-pip
+
+WORKDIR /opt
+ENTRYPOINT [ "/opt/go-judge" ]
+COPY go-judge mount.yaml polaris.yaml /opt/
diff --git a/README.cn.md b/README.cn.md
@@ -16,6 +16,9 @@
 
 ```bash
 docker run -it --rm --privileged --shm-size=256m -p 5050:5050 --name=go-judge criyle/go-judge
+
+# 本地：gRPC注册到polaris
+docker run -it --rm --privileged --shm-size=256m -p 5050:5050 -p 5051:5051 --name=go-judge --env ES_ENABLE_GRPC=true --env ES_GRPC_ADDR=:5051 --env ES_SERVE_ADDR=指定提供服务的IP --add-host="host.docker.internal:host-gateway" go-judge
 ```
 
 ### REST API 接口
@@ -537,17 +540,6 @@ interface Output {
 
 在 `systemd` 为 `init` 的发行版中运行时，`go-judge` 会使用 `dbus` 通知 `systemd` 来创建一个临时 `scope` 作为 `cgroup` 的根。
 
-#### CentOS 7
-
-需要开启 user 命名空间来使用 [stack overflow](https://superuser.com/questions/1294215/is-it-safe-to-enable-user-namespaces-in-centos-7-4-and-how-to-do-it/1294246#1294246)
-
-```bash
-echo user.max_user_namespaces=10000 >> /etc/sysctl.d/98-userns.conf
-sysctl -p
-# 重启生效
-reboot
-```
-
 #### 内存使用
 
 控制进程通常会使用 `20M` 内存，每个容器进程最大会使用 `20M` 内存，每个请求最大会使用 `2 * 16M` + 总 copy out max 限制 * 2 内存。请注意，缓存文件会存储在宿主机的共享内存中 (`/dev/shm`)，请保证其大小足够存储运行时最大可能文件。

diff --git a/README.md b/README.md
@@ -16,6 +16,9 @@ Or, by docker
 
 ```bash
 docker run -it --rm --privileged --shm-size=256m -p 5050:5050 --name=go-judge criyle/go-judge
+
+# gRPC with polaris
+docker run -it --rm --privileged --shm-size=256m -p 5050:5050 -p 5051:5051 --name=go-judge --env ES_ENABLE_GRPC=true --env ES_GRPC_ADDR=:5051 --env ES_SERVE_ADDR=your server IP --add-host="host.docker.internal:host-gateway" go-judge
 ```
 
 ### REST API
@@ -670,11 +673,11 @@ For cgroup v2, systemd dbus will be used to create a transient scope for cgroup
 
 Build container init `cinit`:
 
-`go build -o cinit ./cmd/cinit`
+`go build -o cinit ./cmd/go-judge-init`
 
 Build `go_judge.so`:
 
-`go build -buildmode=c-shared -o go_judge.so ./cmd/ffi/`
+`go build -buildmode=c-shared -o go_judge.so ./cmd/go-judge-ffi/`
 
 For example, in JavaScript, run with `ffi-napi` (seems node 14 is not supported yet):
 
@@ -732,7 +735,7 @@ If a bind mount is specifying a target within the previous mounted one, please e
 ### Windows Support
 
 - Build `go-judge` by: `go build ./cmd/go-judge/`
-- Build `go_judge.dll`: (need to install `gcc` as well) `go build -buildmode=c-shared -o go_judge.so ./cmd/ffi/`
+- Build `go_judge.dll`: (need to install `gcc` as well) `go build -buildmode=c-shared -o go_judge.so ./cmd/go-judge-ffi/`
 - Run: `./go-judge`
 
 #### Windows Security
@@ -744,7 +747,7 @@ If a bind mount is specifying a target within the previous mounted one, please e
 ### MacOS Support
 
 - Build `go-judge` by: `go build ./cmd/go-judge/`
-- Build `go_judge.dylib`: (need to install `XCode`) `go build -buildmode=c-shared -o go_judge.dylib ./cmd/ffi/`
+- Build `go_judge.dylib`: (need to install `XCode`) `go build -buildmode=c-shared -o go_judge.dylib ./cmd/go-judge-ffi/`
 - Run: `./go-judge`
 
 #### MacOS Security
@@ -761,17 +764,6 @@ When running in containers, the `go-judge` will migrate all processed into `/api
 
 When running in Linux distributions powered by `systemd`, the `go-judge` will contact `systemd` via `dbus` to create a transient scope as cgroup root.
 
-#### CentOS 7
-
-By default, user namespace is disabled and it can be enabled following [stack overflow](https://superuser.com/questions/1294215/is-it-safe-to-enable-user-namespaces-in-centos-7-4-and-how-to-do-it/1294246#1294246)
-
-```bash
-echo user.max_user_namespaces=10000 >> /etc/sysctl.d/98-userns.conf
-sysctl -p
-# reboot make the config effective
-reboot
-```
-
 #### Memory Usage
 
 The controller will consume `20M` memory and each container will consume `20M` + size of tmpfs `2 * 128M`. For each request, it consumes as much as user program limit + extra limit (`16k`) + total copy out max. Notice that the cached file stores in the shared memory (`/dev/shm`) of the host, so please ensure enough size allocated.

diff --git a/cmd/go-judge/config/config.go b/cmd/go-judge/config/config.go
@@ -57,6 +57,10 @@ type Config struct {
 
 	// show version and exit
 	Version bool `flagUsage:"show version and exit"`
+
+	// polaris
+	ServeAddr string `flagUsage:"serve instance address for polaris"`
+	ServeName string `flagUsage:"serve name register to polaris" default:"judge.server"`
 }
 
 // Load loads config from flag & environment variables
-Original file line number
+Diff line change
@@ @@ -36,3 +36,7 @@ cmd/go-judge/version/version.txt @@
     dist/
     .vscode
+    # IDE
+    .idea/
+    polaris/