diff --git a/docker-compose-2.yml b/docker-compose-2.yml index 347196a..75d15fc 100644 --- a/docker-compose-2.yml +++ b/docker-compose-2.yml @@ -12,7 +12,7 @@ services: - pgdata:/var/lib/postgresql/data - pgsocket:/var/run/postgresql healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: [ "CMD-SHELL", "pg_isready -U postgres" ] interval: 5s timeout: 5s retries: 5 @@ -28,8 +28,8 @@ services: KMTN_DATABASE_URL: >- postgresql+asyncpg://postgres:postgres@/kmountain?host=/var/run/postgresql KMTN_CORS_ORIGINS: '["http://localhost:4200", "http://localhost"]' - KMTN_ADMIN_USERNAME : "admin" - KMTN_ADMIN_PASSWORD : "123" + KMTN_ADMIN_USERNAME: "admin" + KMTN_ADMIN_PASSWORD: "123" KMTN_STATIC_UPSTREAM_URL: http://frontend:80 volumes: - pgsocket:/var/run/postgresql @@ -63,8 +63,13 @@ services: dockerfile: Dockerfile platform: linux/amd64 restart: unless-stopped - mem_limit: 16g - mem_reservation: 8g + resources: + limits: + cpus: '4.0' + memory: 16g + reservations: + cpus: '2.0' + memory: 8g expose: - "22" volumes: @@ -76,4 +81,4 @@ volumes: pgsocket: logs: flutter-cache: - android-licenses: \ No newline at end of file + android-licenses: diff --git a/docker-compose.yml b/docker-compose.yml index f17b62f..ab3ccea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - pgdata:/var/lib/postgresql/data - pgsocket:/var/run/postgresql healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: [ "CMD-SHELL", "pg_isready -U postgres" ] interval: 5s timeout: 5s retries: 5 @@ -28,8 +28,8 @@ services: KMTN_DATABASE_URL: >- postgresql+asyncpg://postgres:postgres@/kmountain?host=/var/run/postgresql KMTN_CORS_ORIGINS: '["http://localhost:4200", "http://localhost"]' - KMTN_ADMIN_USERNAME : "admin" - KMTN_ADMIN_PASSWORD : "123" + KMTN_ADMIN_USERNAME: "admin" + KMTN_ADMIN_PASSWORD: "123" KMTN_STATIC_UPSTREAM_URL: http://frontend:80 volumes: - pgsocket:/var/run/postgresql @@ -63,8 +63,13 @@ services: dockerfile: Dockerfile platform: linux/amd64 restart: unless-stopped - mem_limit: 16g - mem_reservation: 8g + resources: + limits: + cpus: '4.0' + memory: 16g + reservations: + cpus: '2.0' + memory: 8g expose: - "22" volumes: @@ -76,4 +81,4 @@ volumes: pgsocket: logs: flutter-cache: - android-licenses: \ No newline at end of file + android-licenses: