From 805413026f4c1ee4b5e0520672b4f6b55ef86a9b Mon Sep 17 00:00:00 2001 From: qxsugar Date: Thu, 16 Jan 2025 13:59:24 +0800 Subject: [PATCH] updated: 2025-01-16 13:59:24 --- backup/README.md | 1 + devops/database/docker-compose.yaml | 6 +--- devops/drone/README.md | 1 - devops/drone/docker-compose.yaml | 36 ++++++++++------------ devops/drone/ingress.yaml | 14 ++++----- devops/drone2/docker-compose.yaml | 42 -------------------------- devops/drone2/ingress.yaml | 46 ----------------------------- juno-basic.md | 12 ++++---- 8 files changed, 30 insertions(+), 128 deletions(-) delete mode 100644 devops/drone/README.md delete mode 100644 devops/drone2/docker-compose.yaml delete mode 100644 devops/drone2/ingress.yaml diff --git a/backup/README.md b/backup/README.md index 34b283d..c346584 100644 --- a/backup/README.md +++ b/backup/README.md @@ -5,6 +5,7 @@ ```bash # 每天备份数据库 0 8 * * * /usr/bin/docker exec postgres pg_dumpall -h /var/run/postgresql -U postgres > /usr/local/docker/pgdata-back/backup_$(date +\%Y\%m\%d).sql + # 删除10天前的数据库备份 0 3 * * * find /usr/local/docker/pgdata-back/ -type f -name 'backup_*.sql' -mtime +10 -exec rm {} \; ``` \ No newline at end of file diff --git a/devops/database/docker-compose.yaml b/devops/database/docker-compose.yaml index 1942a66..ba655da 100644 --- a/devops/database/docker-compose.yaml +++ b/devops/database/docker-compose.yaml @@ -14,8 +14,6 @@ services: options: max-size: "100m" max-file: "2" - mem_limit: 2g - cpus: 2 postgres: container_name: postgres @@ -26,6 +24,4 @@ services: volumes: - /usr/local/docker/pgdata:/var/lib/postgresql/data environment: - - POSTGRES_PASSWORD=B2D83DE12717D043 - mem_limit: 2g - cpus: 2 \ No newline at end of file + - POSTGRES_PASSWORD=B2D83DE12717D043 \ No newline at end of file diff --git a/devops/drone/README.md b/devops/drone/README.md deleted file mode 100644 index 478d4cb..0000000 --- a/devops/drone/README.md +++ /dev/null @@ -1 +0,0 @@ -## 之前drone对应的gitlab的配置，现在gitlab已换成gitea \ No newline at end of file diff --git a/devops/drone/docker-compose.yaml b/devops/drone/docker-compose.yaml index ce41d2d..117fc36 100644 --- a/devops/drone/docker-compose.yaml +++ b/devops/drone/docker-compose.yaml @@ -1,46 +1,42 @@ version: "3" services: drone-server: - container_name: drone-server + container_name: drone-server-2 image: drone/drone:2 environment: DRONE_LOGS_DEBUG: true - DRONE_SERVER_HOST: drone.lingpaike.com + DRONE_SERVER_HOST: drone2.lingpaike.com DRONE_SERVER_PROTO: https DRONE_RPC_SECRET: bf5f296c-3e53-40da-94ee-f171fbb33fac - DRONE_GITLAB_CLIENT_ID: 5b3ea89d3c75b03e075eae7dad7b907a9f59aa57eac4d6d387608a6536a829ba - DRONE_GITLAB_CLIENT_SECRET: gloas-d379c826969dd38fe2ca6c05ff68b969c4af093b98fd9cc174962138850dcb3b - DRONE_GITLAB_SERVER: https://gitlab.lingpaike.com/ + DRONE_GITEA_CLIENT_ID: 197ba424-cf07-41be-9b66-f561e71f5293 + DRONE_GIT_ALWAYS_AUTH: "true" + DRONE_GITEA_CLIENT_SECRET: gto_dtdbc5cjfd3dztzfa3qay3nqulp7ifppkzam52ghftv43o6leqia + DRONE_GITEA_SERVER: https://gitea.lingpaike.com DRONE_USER_CREATE: username:root,admin:true DRONE_DATABASE_DRIVER: mysql - DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone?parseTime=true + DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone2?parseTime=true ports: - - "8082:80" + - "8182:80" restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock - deploy: - resources: - limits: - cpus: '4' - memory: 8192M + mem_limit: 2g + cpus: 2 drone-runner: - container_name: drone-runner + container_name: drone-runner-2 image: drone/drone-runner-docker:1 restart: always environment: - DRONE_RPC_HOST: drone-server + DRONE_RPC_HOST: drone-server-2 DRONE_RPC_PROTO: http + DRONE_GIT_ALWAYS_AUTH: "true" DRONE_RPC_SECRET: bf5f296c-3e53-40da-94ee-f171fbb33fac DRONE_RUNNER_CAPACITY: 2 DRONE_RUNNER_NAME: default-agent DRONE_DATABASE_DRIVER: mysql - DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone?parseTime=true + DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone2?parseTime=true volumes: - /var/run/docker.sock:/var/run/docker.sock - deploy: - resources: - limits: - cpus: '4' - memory: 8192M \ No newline at end of file + mem_limit: 2g + cpus: 2 \ No newline at end of file diff --git a/devops/drone/ingress.yaml b/devops/drone/ingress.yaml index 91f0e76..f3ccf15 100644 --- a/devops/drone/ingress.yaml +++ b/devops/drone/ingress.yaml @@ -1,30 +1,30 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: juno-drone + name: juno-drone2 annotations: cert-manager.io/cluster-issuer: letsencrypt-prod spec: tls: - hosts: - - drone.lingpaike.com - secretName: drone.lingpaike.com + - drone2.lingpaike.com + secretName: drone2.lingpaike.com rules: - - host: drone.lingpaike.com + - host: drone2.lingpaike.com http: paths: - pathType: Prefix path: "/" backend: service: - name: juno-drone + name: juno-drone2 port: number: 80 --- apiVersion: v1 kind: Service metadata: - name: juno-drone + name: juno-drone2 spec: ports: - name: http @@ -36,7 +36,7 @@ spec: apiVersion: v1 kind: Endpoints metadata: - name: juno-drone + name: juno-drone2 subsets: - addresses: - ip: 172.17.0.6 diff --git a/devops/drone2/docker-compose.yaml b/devops/drone2/docker-compose.yaml deleted file mode 100644 index 117fc36..0000000 --- a/devops/drone2/docker-compose.yaml +++ /dev/null @@ -1,42 +0,0 @@ -version: "3" -services: - drone-server: - container_name: drone-server-2 - image: drone/drone:2 - environment: - DRONE_LOGS_DEBUG: true - DRONE_SERVER_HOST: drone2.lingpaike.com - DRONE_SERVER_PROTO: https - DRONE_RPC_SECRET: bf5f296c-3e53-40da-94ee-f171fbb33fac - DRONE_GITEA_CLIENT_ID: 197ba424-cf07-41be-9b66-f561e71f5293 - DRONE_GIT_ALWAYS_AUTH: "true" - DRONE_GITEA_CLIENT_SECRET: gto_dtdbc5cjfd3dztzfa3qay3nqulp7ifppkzam52ghftv43o6leqia - DRONE_GITEA_SERVER: https://gitea.lingpaike.com - DRONE_USER_CREATE: username:root,admin:true - DRONE_DATABASE_DRIVER: mysql - DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone2?parseTime=true - ports: - - "8182:80" - restart: always - volumes: - - /var/run/docker.sock:/var/run/docker.sock - mem_limit: 2g - cpus: 2 - - drone-runner: - container_name: drone-runner-2 - image: drone/drone-runner-docker:1 - restart: always - environment: - DRONE_RPC_HOST: drone-server-2 - DRONE_RPC_PROTO: http - DRONE_GIT_ALWAYS_AUTH: "true" - DRONE_RPC_SECRET: bf5f296c-3e53-40da-94ee-f171fbb33fac - DRONE_RUNNER_CAPACITY: 2 - DRONE_RUNNER_NAME: default-agent - DRONE_DATABASE_DRIVER: mysql - DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone2?parseTime=true - volumes: - - /var/run/docker.sock:/var/run/docker.sock - mem_limit: 2g - cpus: 2 \ No newline at end of file diff --git a/devops/drone2/ingress.yaml b/devops/drone2/ingress.yaml deleted file mode 100644 index f3ccf15..0000000 --- a/devops/drone2/ingress.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: juno-drone2 - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod -spec: - tls: - - hosts: - - drone2.lingpaike.com - secretName: drone2.lingpaike.com - rules: - - host: drone2.lingpaike.com - http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: juno-drone2 - port: - number: 80 ---- -apiVersion: v1 -kind: Service -metadata: - name: juno-drone2 -spec: - ports: - - name: http - port: 80 - protocol: TCP - targetPort: http - ---- -apiVersion: v1 -kind: Endpoints -metadata: - name: juno-drone2 -subsets: - - addresses: - - ip: 172.17.0.6 - ports: - - name: http - port: 8182 - protocol: TCP \ No newline at end of file diff --git a/juno-basic.md b/juno-basic.md index c8a4b48..9ed86b4 100644 --- a/juno-basic.md +++ b/juno-basic.md @@ -1,14 +1,12 @@ ### 基础组建机器的服务列表 1. drone-runner 2. drone-server -3. logstash -4. juno-minio -5. kibana -6. elasticsearch +3. juno-minio +4. kibana +5. elasticsearch +6. logstash 7. mysql -8. gitlab +8. gitea 9. postgres 10. redis -### 服务架构 -