7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polish ci and remove es build (#553)

This commit is contained in:
Jared Tan 2024-06-18 10:31:33 +08:00 committed by GitHub
parent 4fd705cc59
commit 3200942373
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.github/config.yml vendored
View File

12
.github/workflows/docker-build-and-release.yaml vendored
View File

@ -1,4 +1,4 @@
name: docker-images-build-and-release name: api-docker-images-build-and-release
on: on:
push: push:
@ -62,12 +62,4 @@ jobs:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: true push: true
tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ui:${{ env.TAG }} 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 }}

11
Makefile
View File

@ -69,15 +69,4 @@ ui-docker-build:
--tag $(REGISTRY)/cmdb-ui:$(CMDB_DOCKER_VERSION) \ --tag $(REGISTRY)/cmdb-ui:$(CMDB_DOCKER_VERSION) \
--tag $(REGISTRY)/cmdb-ui:latest \ --tag $(REGISTRY)/cmdb-ui:latest \
-f docker/Dockerfile-UI \ -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 \
. .

4
docker/Dockerfile-ES
View File

@ -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

7
docker/Dockerfile-UI
View File

@ -1,7 +1,5 @@
# ================================= UI ================================ # ================================= UI ================================
#FROM docker.m.daocloud.io/node:16.0.0-alpine AS builder FROM node:16.20 AS builder
ARG NODE_IMAGE_VERSION=16.20
FROM node:${NODE_IMAGE_VERSION} AS builder
LABEL description="cmdb-ui" 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 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 RUN mkdir /etc/nginx/html && rm -f /etc/nginx/conf.d/default.conf