Skip to content
Snippets Groups Projects
Commit ddb00d6f authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'v1.28' into 'master'

limit resources

See merge request !31
parents 5bdc23f9 ee712366
No related branches found
No related tags found
1 merge request!31limit resources
......@@ -30,6 +30,17 @@ services:
- ../:/var/www/${APP_NAME}
- ./containers/web-server/apache/sites-enabled:/etc/apache2/sites-enabled
- ./containers/web-server/php/extra-php-config.ini:/usr/local/etc/php/conf.d/extra-php-config.ini
deploy:
resources:
limits:
cpus: '0.50'
memory: 250M
pids: 3
reservations:
cpus: '0.25'
memory: 100M
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost"]
interval: 10s
......@@ -64,6 +75,16 @@ services:
- ./containers/db-server/mariadb/my.cnf:/etc/mysql/conf.d/my.cnf
- ./containers/db-server/mariadb/dot_my.cnf:/root/.my.cnf
deploy:
resources:
limits:
cpus: '0.50'
memory: 250M
pids: 100
reservations:
cpus: '0.25'
memory: 100M
# healthcheck:
# test: mysqladmin ping -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD
# interval: 5s
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment