feature: 数据库镜像制作

Author: hhhhsc701

.github/workflows/docker-image-database.yml

@@ -0,0 +1,27 @@
+name: Database Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+    paths:
+      - 'scripts/db/**'
+      - 'scripts/images/database/**'
+      - '.github/workflows/docker-image-database.yml'
+  pull_request:
+    branches: [ "main" ]
+    paths:
+      - 'scripts/db/**'
+      - 'scripts/images/database/**'
+      - '.github/workflows/docker-image-database.yml'
+  workflow_dispatch:
+
+jobs:
+  call-docker-build:
+    name: Build and Push Database Docker Image
+    uses: ./.github/workflows/docker-images-reusable.yml
+    permissions:
+      contents: read
+      packages: write
+    with:
+      service_name: database
+      build_dir: .

.github/workflows/docker-image-runtime.yml

@@ -4,13 +4,15 @@ on:
   push:
     branches: [ "main" ]
     paths:
-      - 'runtime/**'
+      - 'runtime/ops/**'
+      - 'runtime/python-executor/**'
       - 'scripts/images/runtime/**'
       - '.github/workflows/docker-image-runtime.yml'
   pull_request:
     branches: [ "main" ]
     paths:
-      - 'runtime/**'
+      - 'runtime/ops/**'
+      - 'runtime/python-executor/**'
       - 'scripts/images/runtime/**'
       - '.github/workflows/docker-image-runtime.yml'
   workflow_dispatch:

Makefile

@@ -18,7 +18,7 @@ build-%:
 	$(MAKE) $*-docker-build
 
 .PHONY: build
-build: backend-docker-build frontend-docker-build runtime-docker-build
+build: database-docker-build backend-docker-build frontend-docker-build runtime-docker-build
 
 .PHONY: create-namespace
 create-namespace:
@@ -105,6 +105,10 @@ endif
 backend-docker-build:
 	docker build -t datamate-backend:$(VERSION) . -f scripts/images/backend/Dockerfile
 
+.PHONY: database-docker-build
+database-docker-build:
+	docker build -t datamate-database:$(VERSION) . -f scripts/images/database/Dockerfile
+
 .PHONY: frontend-docker-build
 frontend-docker-build:
 	docker build -t datamate-frontend:$(VERSION) . -f scripts/images/frontend/Dockerfile
@@ -206,20 +210,18 @@ milvus-docker-uninstall:
 
 .PHONY: datamate-k8s-install
 datamate-k8s-install: create-namespace
-	kubectl create configmap datamate-init-sql --from-file=scripts/db/ --dry-run=client -o yaml | kubectl apply -f - -n $(NAMESPACE)
-	helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.image.repository=$(REPOSITORY)
+	helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.image.repository=$(REGISTRY)
 
 .PHONY: datamate-k8s-uninstall
 datamate-k8s-uninstall:
 	helm uninstall datamate -n $(NAMESPACE) --ignore-not-found
-	kubectl delete configmap datamate-init-sql -n $(NAMESPACE) --ignore-not-found
 
 .PHONY: deer-flow-k8s-install
 deer-flow-k8s-install:
-	helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.deerFlow.enable=true --set global.image.repository=$(REPOSITORY)
+	helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.deerFlow.enable=true --set global.image.repository=$(REGISTRY)
 	cp runtime/deer-flow/.env deployment/helm/deer-flow/charts/public/.env
 	cp runtime/deer-flow/conf.yaml deployment/helm/deer-flow/charts/public/conf.yaml
-	helm upgrade deer-flow deployment/helm/deer-flow -n $(NAMESPACE) --install --set global.image.repository=$(REPOSITORY)
+	helm upgrade deer-flow deployment/helm/deer-flow -n $(NAMESPACE) --install --set global.image.repository=$(REGISTRY)
 
 .PHONY: deer-flow-k8s-uninstall
 deer-flow-k8s-uninstall:

deployment/docker/datamate/docker-compose.yml

@@ -49,7 +49,7 @@ services:
   # 3) database
   datamate-database:
     container_name: datamate-database
-    image: mysql:8
+    image: ${REGISTRY:-}datamate-database
     restart: on-failure
     environment:
       MYSQL_ROOT_PASSWORD: password
@@ -61,8 +61,6 @@ services:
       "
     volumes:
       - mysql_volume:/var/lib/mysql
-      - ../../../scripts/db:/docker-entrypoint-initdb.d
-      - ./utf8.cnf:/etc/mysql/conf.d/utf8.cnf:ro
       - database_log_volume:/var/log/datamate/database
     ports:
       - "3306:3306"

deployment/helm/datamate/charts/database/templates/_helpers.tpl

@@ -67,5 +67,9 @@ Name of image
 {{- define "database.image" -}}
 {{- $name := default .Values.image.repository .Values.global.image.database.name }}
 {{- $tag := default .Values.image.tag .Values.global.image.database.tag }}
+{{- if .Values.global.image.repository }}
+{{- .Values.global.image.repository | trimSuffix "/" }}/{{ $name }}:{{ $tag }}
+{{- else }}
 {{- $name }}:{{ $tag }}
 {{- end }}
+{{- end }}

deployment/helm/datamate/charts/database/templates/configmap.yaml

@@ -7,21 +7,19 @@ replicaCount: 1
 
 # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
 image:
-  repository: "mysql"
+  repository: "datamate-database"
   # This sets the pull policy for images.
   pullPolicy: "IfNotPresent"
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "8"
+  tag: "latest"
 
 # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
 imagePullSecrets: []
 # This is to override the chart name.
 nameOverride: "datamate-database"
 fullnameOverride: "datamate-database"
 
-env:
-  - name: MYSQL_ROOT_PASSWORD
-    value: "password"
+env: []
 
 initContainers:
   - name: init-log

deployment/helm/datamate/charts/database/values.yaml

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

deployment/helm/datamate/charts/public/.helmignore

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: public
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.0.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.0.1"

deployment/helm/datamate/charts/public/Chart.yaml

@@ -0,0 +1,51 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "public.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "public.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "public.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "public.labels" -}}
+helm.sh/chart: {{ include "public.chart" . }}
+{{ include "public.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "public.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "public.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}