chore: build new dashboard ui into apisix rpm&deb package (#433)

Signed-off-by: Nic <[email protected]>

Author: nic-6443

.github/workflows/package-apisix-deb-ubuntu20.04.yml

@@ -27,6 +27,9 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install -y make
+          # install node.js and pnpm
+          sudo n lts
+          corepack enable pnpm
       
       - name: run apisix packaging
         run: |
@@ -62,6 +65,12 @@ jobs:
               exit 125
           fi
 
+          code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9180/ui/)
+          if [ ! $code -eq 200 ]; then
+              echo "failed: failed to access Apache APISIX UI"
+              exit 1
+          fi
+
       - name: Publish Artifact
         uses: actions/[email protected]
         with:

.github/workflows/package-apisix-rpm-ubi.yml

@@ -36,6 +36,9 @@ jobs:
           sudo apt-get install -y make ruby ruby-dev rubygems build-essential
           sudo gem install --no-document fpm
           sudo apt-get install -y rpm
+          # install node.js and pnpm
+          sudo n lts
+          corepack enable pnpm
 
       - name: packaging APISIX(-remote) with remote code
         run: |
@@ -46,6 +49,7 @@ jobs:
         run: |
           wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
           git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git
+          ./build-apisix-dashboard.sh ./apisix
           make package type=rpm app=apisix version=master checkout=${APISIX_VERSION} runtime_version=${APISIX_RUNTIME} image_base=registry.access.redhat.com/ubi8/ubi image_tag=8.6 local_code_path=./apisix artifact=apisix-local
 
       - name: run ubi8 docker and mapping rpm into container
@@ -89,6 +93,12 @@ jobs:
               exit 1
           fi
 
+          code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9180/ui/)
+          if [ ! $code -eq 200 ]; then
+              echo "failed: failed to access Apache APISIX UI"
+              exit 1
+          fi
+
       - name: Publish Artifact
         uses: actions/[email protected]
         with:

.github/workflows/publish-deb.yml

@@ -40,6 +40,9 @@ jobs:
       - name: Init basic publish env
         run: |
           sudo apt-get update
+          # install node.js and pnpm
+          sudo n lts
+          corepack enable pnpm
           mkdir -p "${VAR_DEB_WORKBENCH_DIR}"
 
       - name: Extract Tags version

.github/workflows/publish.yml

@@ -40,6 +40,9 @@ jobs:
           # install publish env deps
           sudo apt-get update
           sudo apt install -y createrepo-c
+          # install node.js and pnpm
+          sudo n lts
+          corepack enable pnpm
           mkdir -p "${VAR_RPM_WORKBENCH_DIR}"
           # init env var
           TAG_DATE=$(date +%Y%m%d)

.gitignore

@@ -1 +1,3 @@
-.idea
+.idea
+apisix
+apisix-runtime

Makefile

@@ -194,7 +194,8 @@ endef
 .PHONY: build-apisix-rpm
 build-apisix-rpm:
 ifeq ($(local_code_path), 0)
-	git clone -b $(checkout) $(apisix_repo) ./apisix
+	git clone -b $(checkout) $(apisix_repo) --depth 1 ./apisix
+	./build-apisix-dashboard.sh ./apisix
 	$(call build,apisix,apisix,rpm,"./apisix")
 	rm -fr ./apisix
 else
@@ -204,7 +205,8 @@ endif
 .PHONY: build-apisix-deb
 build-apisix-deb:
 ifeq ($(local_code_path), 0)
-	git clone -b $(checkout) $(apisix_repo) ./apisix
+	git clone -b $(checkout) $(apisix_repo) --depth 1 ./apisix
+	./build-apisix-dashboard.sh ./apisix
 	$(call build,apisix,apisix,deb,"./apisix")
 	rm -fr ./apisix
 else

build-apisix-dashboard.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+set -x
+
+cd $1
+source .requirements
+if [ -z "${APISIX_DASHBOARD_COMMIT:-}" ]; then
+    echo "Error: APISIX_DASHBOARD_COMMIT is not set or empty"
+    exit 1
+fi
+git clone --revision=${APISIX_DASHBOARD_COMMIT} --depth 1 https://github.com/apache/apisix-dashboard.git
+pushd apisix-dashboard
+# compile
+pnpm install --frozen-lockfile
+pnpm run build
+popd
+# copy the dist files to the ui directory
+mkdir ui
+cp -r apisix-dashboard/dist/* ui/
+rm -rf apisix-dashboard

utils/install-common.sh

@@ -105,6 +105,7 @@ install_apisix() {
         sed -i "1s@.*@$bin@" /tmp/build/output/apisix/usr/bin/apisix
     fi
     cp -r /usr/local/apisix/* /tmp/build/output/apisix/usr/local/apisix/
+    cp -r /apisix/ui /tmp/build/output/apisix/usr/local/apisix/ui
     mv /tmp/build/output/apisix/usr/local/apisix/deps/share/lua/5.1/apisix /tmp/build/output/apisix/usr/local/apisix/
     if is_newer_version "${checkout_v}"; then
         bin='package.path = "/usr/local/apisix/?.lua;" .. package.path'