feat: 支持二级路径

.dockerignore

@@ -1,27 +1,5 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Go template
-# Binaries for programs and plugins
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-.gitignore
-bin
+.*
 data
-docs
-guacd
 logs
 playground
-screenshot
 web/node_modules/
-.dockerignore

.github/workflows/docker-guacamole-server.yml

@@ -0,0 +1,39 @@
+name: Docker Guacamole Server Build
+
+on:
+  workflow_dispatch:
+
+jobs:
+  guacamole_server:
+    name: Build guacamole-server
+    runs-on: ubuntu-latest
+    steps:
+      - name: Private Actions Checkout
+        uses: actions/[email protected]
+      - name: Docker Setup QEMU
+        uses: docker/[email protected]
+      - name: Docker Setup Buildx
+        uses: docker/[email protected]
+      - name: Get resources
+        run: |
+          rm -rf *
+          wget -O /tmp/master.zip https://github.com/apache/guacamole-server/archive/refs/heads/master.zip
+          unzip /tmp/master.zip -d /tmp
+          mv /tmp/guacamole-server-master/* .
+
+      - name: Docker Login
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Build and push Docker images
+        uses: docker/[email protected]
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7,linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:1.4.0
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache,mode=max

.github/workflows/docker-guacd.yml

@@ -0,0 +1,42 @@
+name: Docker guacd Build
+
+on:
+  workflow_dispatch:
+
+jobs:
+  DOCKERHUB_Guacd_Build:
+    name: Docker Guacd Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Private Actions Checkout
+        uses: actions/[email protected]
+      - name: Docker Setup QEMU
+        uses: docker/[email protected]
+      - name: Docker Setup Buildx
+        uses: docker/[email protected]
+      - name: Docker Login
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Docker Aliyun Login
+        uses: docker/[email protected]
+        with:
+          registry: registry.cn-beijing.aliyuncs.com
+          username: ${{ secrets.ALI_USERNAME }}
+          password: ${{ secrets.ALI_PASSWORD }}
+
+      - name: Build and push Docker images
+        uses: docker/[email protected]
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7,linux/amd64
+          file: guacd/Dockerfile
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0
+            ${{ secrets.DOCKERHUB_USERNAME }}/guacd:latest
+            registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0
+            registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:latest
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache,mode=max

.github/workflows/docker-next-terminal.yml

@@ -0,0 +1,71 @@
+name: Docker next-terminal Build
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  DOCKERHUB_next-terminal_Build:
+    name: Docker next-terminal Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      - name: Private Actions Checkout
+        uses: actions/checkout@v3
+      - name: Docker Setup QEMU
+        uses: docker/[email protected]
+      - name: Docker Setup Buildx
+        uses: docker/[email protected]
+      - name: node Setup
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: npm install
+        run: |
+          cd web
+          npm install --global yarn
+          yarn
+          yarn build
+      - name: Docker Login
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: Docker Aliyun Login
+        uses: docker/[email protected]
+        with:
+          registry: registry.cn-beijing.aliyuncs.com
+          username: ${{ secrets.ALI_USERNAME }}
+          password: ${{ secrets.ALI_PASSWORD }}
+      - name: Build and push Docker images
+        uses: docker/[email protected]
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7,linux/amd64
+          file: Dockerfile
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/next-terminal:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/next-terminal:${{ steps.get_version.outputs.VERSION }}
+            registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/next-terminal:latest
+            registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/next-terminal:${{ steps.get_version.outputs.VERSION }}
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/next-terminal:cache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/next-terminal:cache,mode=max
+
+  DOCKERHUB_Hub_Description:
+    needs: [ DOCKERHUB_next-terminal_Build ]
+    name: Change DockerHub Description
+    runs-on: ubuntu-latest
+    steps:
+      - name: Private Actions Checkout
+        uses: actions/[email protected]
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: ${{ secrets.DOCKERHUB_USERNAME }}/next-terminal

.github/workflows/golangci-lint.yml

@@ -18,5 +18,5 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
+          version: v1.42.1
           args: --timeout=5m

.github/workflows/release-next-terminal.yml

@@ -0,0 +1,46 @@
+name: next-terminal Release
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  next-terminal_Release:
+    name: next-terminal release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      - name: Private Actions Checkout
+        uses: actions/checkout@v3
+      - name: node Setup
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: npm install
+        run: |
+          cd web
+          npm install --global yarn
+          yarn
+      - name: go Setup
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+      - name: Build package Linux
+        run: |
+          sh build.sh
+          mv next-terminal next-terminal-bin
+          mkdir next-terminal
+          cp next-terminal-bin next-terminal/next-terminal
+          cp config.yml.example next-terminal/config.yml
+          cp LICENSE next-terminal/
+          tar zcvf next-terminal.tar.gz next-terminal/
+      - name: release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: next-terminal.tar.gz
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -21,13 +21,13 @@ web/build
 *.swp
 
 
-# playground
-playground/data
-playground/drive
-playground/recording
-
-/log
-
-
 # next terminal
-/recording
+/data/
+/logs/
+
+/web/build/*
+/server/resource/build/*
+/server/resource/static/
+/server/resource/*.html
+/server/resource/*.json
+/server/resource/*.ico

Dockerfile

@@ -9,16 +9,20 @@ WORKDIR /app
 COPY . .
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
-RUN apk add gcc g++
-RUN go env && CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -ldflags '-linkmode external -extldflags "-static"' -o next-terminal main.go
+RUN #apk add upx
+RUN go mod tidy
+RUN sh get_arch.sh
+RUN echo "Hello, my CPU architecture is $(uname -m)"
+RUN cp -r /app/web/build /app/server/resource/
+RUN go env;CGO_ENABLED=0 GOOS=linux GOARCH=$ARCH go build -ldflags '-s -w' -o next-terminal main.go
+RUN #upx next-terminal
 
 FROM alpine:latest
 
 LABEL MAINTAINER="[email protected]"
 
 ENV TZ Asia/Shanghai
 ENV DB sqlite
-ENV CONTAINER "true"
 ENV SQLITE_FILE './data/sqlite/next-terminal.db'
 ENV SERVER_PORT 8088
 ENV SERVER_ADDR 0.0.0.0:$SERVER_PORT
@@ -32,7 +36,6 @@ RUN touch config.yml
 
 COPY --from=builder /app/next-terminal ./
 COPY --from=builder /app/LICENSE ./
-COPY --from=builder /app/web/build ./web/build
 
 EXPOSE $SERVER_PORT $SSHD_PORT