From 46553df6ec2d6247dd801887494149de3dcab593 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Wed, 18 Jun 2025 20:59:18 +0800
Subject: [PATCH] chore: update ci

---
 .github/workflows/build-docker.yml            |  2 +-
 .github/workflows/release.yml                 |  2 +-
 docker/nocobase-full/docker-entrypoint.sh     | 19 --------
 docker/nocobase-full/nocobase.conf            | 43 -------------------
 .../{Dockerfile-cn => Dockerfile-full}        |  0
 5 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100755 docker/nocobase-full/docker-entrypoint.sh
 delete mode 100644 docker/nocobase-full/nocobase.conf
 rename docker/nocobase/{Dockerfile-cn => Dockerfile-full} (100%)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 31075e446a..0703648fb3 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -36,7 +36,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./docker/nocobase
-          file: ./docker/nocobase/Dockerfile-cn
+          file: ./docker/nocobase/Dockerfile-full
           build-args: |
             CNA_VERSION=${{ inputs.tag_name }}
           platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 75d5b46a4c..953c83a15c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -216,7 +216,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./docker/nocobase
-          file: ./docker/nocobase/Dockerfile-cn
+          file: ./docker/nocobase/Dockerfile-full
           build-args: |
             CNA_VERSION=${{ steps.get-info.outputs.defaultTag }}
           platforms: linux/amd64,linux/arm64
diff --git a/docker/nocobase-full/docker-entrypoint.sh b/docker/nocobase-full/docker-entrypoint.sh
deleted file mode 100755
index c81b3963ad..0000000000
--- a/docker/nocobase-full/docker-entrypoint.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-nginx
-echo 'nginx started';
-
-cd /app/nocobase && yarn nocobase db:auth --retry=30
-cd /app/nocobase && yarn nocobase install -s
-cd /app/nocobase && yarn nocobase upgrade -S
-cd /app/nocobase && yarn start
-
-# Run command with node if the first argument contains a "-" or is not a system command. The last
-# part inside the "{}" is a workaround for the following bug in ash/dash:
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264
-if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then
-  set -- node "$@"
-fi
-
-exec "$@"
diff --git a/docker/nocobase-full/nocobase.conf b/docker/nocobase-full/nocobase.conf
deleted file mode 100644
index 7de9bbb630..0000000000
--- a/docker/nocobase-full/nocobase.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-log_format apm '"$time_local" client=$remote_addr '
-               'method=$request_method request="$request" '
-               'request_length=$request_length '
-               'status=$status bytes_sent=$bytes_sent '
-               'body_bytes_sent=$body_bytes_sent '
-               'referer=$http_referer '
-               'user_agent="$http_user_agent" '
-               'upstream_addr=$upstream_addr '
-               'upstream_status=$upstream_status '
-               'request_time=$request_time '
-               'upstream_response_time=$upstream_response_time '
-               'upstream_connect_time=$upstream_connect_time '
-               'upstream_header_time=$upstream_header_time';
-
-server {
-    listen 80;
-    server_name _;
-    root /app/nocobase/packages/app/client/dist;
-    index index.html;
-    client_max_body_size 0;
-
-    access_log /var/log/nginx/nocobase.log apm;
-
-    location /storage/uploads/ {
-        alias /app/nocobase/storage/uploads/;
-        autoindex off;
-    }
-
-    location / {
-        root /app/nocobase/packages/app/client/dist;
-        try_files $uri $uri/ /index.html;
-    }
-
-    location ^~ /api/ {
-        proxy_pass http://127.0.0.1:13000/api/;
-        proxy_http_version 1.1;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-    }
-}
diff --git a/docker/nocobase/Dockerfile-cn b/docker/nocobase/Dockerfile-full
similarity index 100%
rename from docker/nocobase/Dockerfile-cn
rename to docker/nocobase/Dockerfile-full