From 819cd2884b6520c397b9954d9c3d893e2ad01d61 Mon Sep 17 00:00:00 2001
From: Jared Tan <jian.tan@daocloud.io>
Date: Tue, 18 Jun 2024 10:31:33 +0800
Subject: [PATCH] polish ci and remove es build (#553)

---
 .github/config.yml                              |  0
 .github/workflows/docker-build-and-release.yaml | 12 ++----------
 Makefile                                        | 11 -----------
 docker/Dockerfile-ES                            |  4 ----
 docker/Dockerfile-UI                            |  7 ++-----
 5 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 .github/config.yml
 delete mode 100644 docker/Dockerfile-ES

diff --git a/.github/config.yml b/.github/config.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/.github/workflows/docker-build-and-release.yaml b/.github/workflows/docker-build-and-release.yaml
index 0f1b9ff..6cbd066 100644
--- a/.github/workflows/docker-build-and-release.yaml
+++ b/.github/workflows/docker-build-and-release.yaml
@@ -1,4 +1,4 @@
-name: docker-images-build-and-release
+name: api-docker-images-build-and-release
 
 on:
   push:
@@ -62,12 +62,4 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ui:${{ env.TAG }}
-      - name: Build and push CMDB-ES Docker image
-        uses: docker/build-push-action@v6
-        with:
-          file: docker/Dockerfile-ES
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ES:${{ env.TAG }}
\ No newline at end of file
+          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ui:${{ env.TAG }}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e24ac76..36591cf 100644
--- a/Makefile
+++ b/Makefile
@@ -69,15 +69,4 @@ ui-docker-build:
     			--tag $(REGISTRY)/cmdb-ui:$(CMDB_DOCKER_VERSION)  \
     			--tag $(REGISTRY)/cmdb-ui:latest  \
     			-f docker/Dockerfile-UI \
-    			.
-
-es-docker-build:
-	export DOCKER_CLI_EXPERIMENTAL=enabled ;\
-	! ( docker buildx ls | grep multi-platform-builder ) && docker buildx create --use --platform=$(BUILD_ARCH) --name multi-platform-builder ;\
-	docker buildx build \
-    			--builder multi-platform-builder \
-    			--platform=$(BUILD_ARCH) \
-    			--tag $(REGISTRY)/cmdb-es:$(CMDB_DOCKER_VERSION)  \
-    			--tag $(REGISTRY)/cmdb-es:latest  \
-    			-f docker/Dockerfile-ES \
     			.
\ No newline at end of file
diff --git a/docker/Dockerfile-ES b/docker/Dockerfile-ES
deleted file mode 100644
index 151de06..0000000
--- a/docker/Dockerfile-ES
+++ /dev/null
@@ -1,4 +0,0 @@
-# ================================= Search ================================
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.4.2 AS cmdb-search
-
-RUN yes | ./bin/elasticsearch-plugin install https://github.com/medcl/elasticsearch-analysis-ik/releases/download/v7.4.2/elasticsearch-analysis-ik-7.4.2.zip
diff --git a/docker/Dockerfile-UI b/docker/Dockerfile-UI
index 26866f6..0fd74b0 100644
--- a/docker/Dockerfile-UI
+++ b/docker/Dockerfile-UI
@@ -1,7 +1,5 @@
 # ================================= UI ================================
-#FROM docker.m.daocloud.io/node:16.0.0-alpine AS builder
-ARG NODE_IMAGE_VERSION=16.20
-FROM node:${NODE_IMAGE_VERSION} AS builder
+FROM node:16.20 AS builder
 
 LABEL description="cmdb-ui"
 
@@ -11,8 +9,7 @@ WORKDIR /data/apps/cmdb-ui
 
 RUN sed -i "s#http://127.0.0.1:5000##g" .env && yarn install  && yarn build
 
-FROM docker.m.daocloud.io/library/nginx:1.21.4 AS cmdb-ui
-#FROM nginx:1.21.4 AS cmdb-ui
+FROM nginx:1.21.4 AS cmdb-ui
 
 RUN mkdir /etc/nginx/html && rm -f /etc/nginx/conf.d/default.conf