update: adjust deploy scripts

Dockerfile

@@ -3,7 +3,8 @@
 
 ####################################
 ## (1) Setup the build environment
-FROM dockerproxy.com/library/golang:1.21-bullseye AS build-env
+FROM dockerproxy.com/library/golang:1.22-bullseye AS build-env
+# FROM golang:1.22-bullseye AS build-env
 
 # Build the app binary in /app
 RUN mkdir /app
@@ -70,7 +71,8 @@ RUN --mount=type=ssh \
 RUN chmod a+x /app/bin/app
 
 ## (4) Add the statically linked debug binary to a distroless image configured for debugging
-FROM dockerproxy.com/library/golang:1.21-bullseye as debug-dlv
+FROM dockerproxy.com/library/golang:1.22-bullseye as debug-dlv
+# FROM golang:1.22-bullseye as debug-dlv
 RUN go env -w GOPROXY=https://goproxy.cn,direct
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 

Makefile

@@ -71,6 +71,12 @@ api:
 #    		--openapiv2_out=./api 
 #     		--openapiv2_opt logtostderr=true 
 
+# generate image names，like：
+# app/biz-trainer
+# app/biz-training
+# app/gateway-gomono
+# app/task-migration
+# app/bff-gomono
 names=$(shell find app -name main.go|xargs -I X dirname X)
 
 # build execute 
@@ -89,7 +95,7 @@ wire:
 	find app  -mindepth 2 -maxdepth 2 | grep cmd | $(wireCmd)
 
 export DOCKER_BUILDKIT := 1
-# (optional)Image registry address
+# (optional)Image registry address 
 CONTAINER_REGISTRY=
 
 # build docker images
@@ -144,7 +150,7 @@ build-docker-debug-dlv:
 
 .PHONY: all
 # make all
-all: init config api wire build build-docker-debug
+all: init config api wire build build-docker-debug 
 
 # show help
 help:

README.md

@@ -137,25 +137,30 @@ node1
 
 登录master管理节点，执行：
 ```bash
-ansible-playbook ./deploy/docker/ansible_playbook/ssh_login_no_password.yml
+ansible-playbook ./deploy/docker/cluster-init/ssh_login_no_password.yml
 ```
 
 如果安装失败，需要手动复制key：`ssh-copy-id [email protected]`
 
 ### 1.5 批量设置hostname
 
 ```bash
-ansible-playbook ./deploy/docker/ansible_playbook/modify_hostname.yml
+ansible-playbook ./deploy/docker/cluster-init/modify_hostname.yml
 ```
 
+### 1.5 批量设置dns
+
+```bash
+ansible-playbook ./deploy/docker/cluster-init/config_dns.yml
+```
 
 ## 2部署基础设施
 
 1. 安装docker和docker-compose
 
     ```bash
     cd goMono
-    ansible-playbook ./deploy/docker/ansible_playbook/install_docker_online.yml
+    ansible-playbook ./deploy/docker/infra-docker/install_docker_online.yml
     ```
     > 注意：如果执行palybook时报错：
     `fatal: [node1]: FAILED! => {"changed": false, "msg": "The Python 2 bindings for rpm are needed for this module. If you require Python 3 support use the `dnf` Ansible module instead.. The Python 2 yum module is needed for this module. If you require Python 3 support use the dnf Ansible module instead."}`, 需要将`/etc/ansible/hosts`中的`ansible_python_interpreter=/usr/bin/python3` 改为 `ansible_python_interpreter=/usr/bin/python2`， 或者，在ansible-playbook命令后面添加参数：`-e ansible_python_interpreter=/usr/bin/python2`
@@ -167,7 +172,7 @@ ansible-playbook ./deploy/docker/ansible_playbook/modify_hostname.yml
 
     ```bash
     cd goMono
-    ansible-playbook ./deploy/docker/ansible_playbook/install_docker_registry.yml
+    ansible-playbook ./deploy/docker/infra-docker/install_docker_registry.yml
     ```
 
     部署完成后，私有仓库在 `http://<域名/IP>:8080/` 上提供服务。（使用域名时，可能需要配置本地DNS）
@@ -195,8 +200,8 @@ ansible-playbook ./deploy/docker/ansible_playbook/modify_hostname.yml
 
   注意：
 
-  - 默认只设置了nacos的数据源，如果需要增加其他数据源，修改 `./deploy/docker/config_prometheus.env` 配置
-  - nacos的dashboard配置是： `deploy/docker/config_nacos_grafana_dashboard.json`
+  - 默认只设置了nacos的数据源，如果需要增加其他数据源，修改 `./deploy/docker/infra-prometheus/config_prometheus.env` 配置
+  - nacos的dashboard配置是： `deploy/docker/infra-prometheus/config_nacos_grafana_dashboard.json`
 
 # 开发微服务