diff --git a/devops/database/docker-compose.yaml b/devops/database/docker-compose.yaml index ba655da..1942a66 100644 --- a/devops/database/docker-compose.yaml +++ b/devops/database/docker-compose.yaml @@ -14,6 +14,8 @@ services: options: max-size: "100m" max-file: "2" + mem_limit: 2g + cpus: 2 postgres: container_name: postgres @@ -24,4 +26,6 @@ services: volumes: - /usr/local/docker/pgdata:/var/lib/postgresql/data environment: - - POSTGRES_PASSWORD=B2D83DE12717D043 \ No newline at end of file + - POSTGRES_PASSWORD=B2D83DE12717D043 + mem_limit: 2g + cpus: 2 \ No newline at end of file diff --git a/devops/drone/docker-compose.yaml b/devops/drone/docker-compose.yaml index ce41d2d..7340882 100644 --- a/devops/drone/docker-compose.yaml +++ b/devops/drone/docker-compose.yaml @@ -19,11 +19,8 @@ services: 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 @@ -39,8 +36,5 @@ services: DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone?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/elk/docker/docker-compose.yaml b/devops/elk/docker/docker-compose.yaml index 8905165..b6c239d 100644 --- a/devops/elk/docker/docker-compose.yaml +++ b/devops/elk/docker/docker-compose.yaml @@ -16,11 +16,8 @@ services: ports: - "9200:9200" - "9300:9300" - deploy: - resources: - limits: - cpus: "2.0" - memory: 2g + mem_limit: 2g + cpus: 2 logstash: container_name: logstash @@ -35,11 +32,8 @@ services: - elasticsearch depends_on: - elasticsearch - deploy: - resources: - limits: - cpus: "2.0" - memory: 2g + mem_limit: 2g + cpus: 2 kibana: container_name: kibana @@ -56,3 +50,5 @@ services: - elasticsearch depends_on: - elasticsearch + mem_limit: 2g + cpus: 2 \ No newline at end of file diff --git a/devops/gitlab/docker-compose.yaml b/devops/gitlab/docker-compose.yaml index 4114adc..787f1f5 100644 --- a/devops/gitlab/docker-compose.yaml +++ b/devops/gitlab/docker-compose.yaml @@ -14,8 +14,5 @@ services: - /usr/local/docker/gitlab/opt:/var/opt/gitlab environment: - TZ=Asia/Shanghai - deploy: - resources: - limits: - cpus: '4' - memory: 4g + mem_limit: 2g + cpus: 1.0 diff --git a/devops/minio/docker-compose.yaml b/devops/minio/docker-compose.yaml index e1d3bd6..c20e145 100644 --- a/devops/minio/docker-compose.yaml +++ b/devops/minio/docker-compose.yaml @@ -13,3 +13,5 @@ services: MINIO_ROOT_PASSWORD: hEWDoUr6iAwP volumes: - /data/minio/data1:/data1 + mem_limit: 1g + cpus: 1.0 \ No newline at end of file diff --git a/devops/mysql/docker-compose.yaml b/devops/mysql/docker-compose.yaml index bf18e89..b9a2147 100644 --- a/devops/mysql/docker-compose.yaml +++ b/devops/mysql/docker-compose.yaml @@ -12,4 +12,6 @@ services: volumes: - ./mysql:/var/lib/mysql ports: - - "3306:3306" \ No newline at end of file + - "3306:3306" + mem_limit: 1g + cpus: 1.0 \ No newline at end of file