diff options
| author | startxfr <clarue@startx.fr> | 2015-12-05 08:09:45 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-12-05 08:09:45 +0100 |
| commit | a656803d2375dce6e5dcdf5bd334335260b4ae53 (patch) | |
| tree | 6ea918836f0da50046796c640d67d719b7318f84 | |
| parent | 68a98844d62839a2ba6340b62c1b75287b610b50 (diff) | |
| download | phpmyadmin-a656803d2375dce6e5dcdf5bd334335260b4ae53.tar.gz phpmyadmin-a656803d2375dce6e5dcdf5bd334335260b4ae53.tar.bz2 phpmyadmin-a656803d2375dce6e5dcdf5bd334335260b4ae53.tar.xz phpmyadmin-a656803d2375dce6e5dcdf5bd334335260b4ae53.zip | |
addapting master documentation
| -rw-r--r-- | OS/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/apache/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/mariadb/docker-compose.yml | 3 | ||||
| -rw-r--r-- | Services/memcache/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/mongo/docker-compose.yml | 3 | ||||
| -rw-r--r-- | Services/nodejs/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/ooconv/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/php/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/postgres/docker-compose.yml | 3 |
9 files changed, 3 insertions, 12 deletions
diff --git a/OS/docker-compose.yml b/OS/docker-compose.yml index b9e2dde..b062fc8 100644 --- a/OS/docker-compose.yml +++ b/OS/docker-compose.yml @@ -1,6 +1,5 @@ fedora: build: ./ -# image: sx-fedora container_name: "os-fedora" mem_limit: 1g memswap_limit: 1g diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml index ed68cab..42e1f23 100644 --- a/Services/apache/docker-compose.yml +++ b/Services/apache/docker-compose.yml @@ -1,6 +1,5 @@ server: build: ./ -# image: sv-apache container_name: "apache-server" mem_limit: 500m memswap_limit: 500m diff --git a/Services/mariadb/docker-compose.yml b/Services/mariadb/docker-compose.yml index 841d699..e81fb36 100644 --- a/Services/mariadb/docker-compose.yml +++ b/Services/mariadb/docker-compose.yml @@ -1,7 +1,6 @@ server: build: ./ -# image: sx-mariadb - container_name: "sx-mariadb" + container_name: "mariadb-server" mem_limit: 1g memswap_limit: 1g cpu_shares: 8 diff --git a/Services/memcache/docker-compose.yml b/Services/memcache/docker-compose.yml index dbf0dc6..1da4fff 100644 --- a/Services/memcache/docker-compose.yml +++ b/Services/memcache/docker-compose.yml @@ -1,6 +1,5 @@ server: build: ./ -# image: sv-memcache container_name: "memcache-server" mem_limit: 1.5g memswap_limit: 500m diff --git a/Services/mongo/docker-compose.yml b/Services/mongo/docker-compose.yml index 3c6a790..17982a5 100644 --- a/Services/mongo/docker-compose.yml +++ b/Services/mongo/docker-compose.yml @@ -1,7 +1,6 @@ server: build: ./ -# image: sx-mongo - container_name: "sx-mongo" + container_name: "mongo-server" mem_limit: 2g memswap_limit: 2g cpu_shares: 10 diff --git a/Services/nodejs/docker-compose.yml b/Services/nodejs/docker-compose.yml index 4f26e53..af118ec 100644 --- a/Services/nodejs/docker-compose.yml +++ b/Services/nodejs/docker-compose.yml @@ -1,6 +1,5 @@ server: build: ./ -# image: sv-nodejs container_name: "nodejs-server" mem_limit: 1g memswap_limit: 1g diff --git a/Services/ooconv/docker-compose.yml b/Services/ooconv/docker-compose.yml index 297a045..48b535c 100644 --- a/Services/ooconv/docker-compose.yml +++ b/Services/ooconv/docker-compose.yml @@ -1,6 +1,5 @@ server: build: ./ -# image: sv-ooconv container_name: "ooconv-server" mem_limit: 2g memswap_limit: 2g diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml index 8ea5414..beff9fe 100644 --- a/Services/php/docker-compose.yml +++ b/Services/php/docker-compose.yml @@ -1,6 +1,5 @@ server: build: ./ -# image: sx-php container_name: "php-server" mem_limit: 1g memswap_limit: 1g diff --git a/Services/postgres/docker-compose.yml b/Services/postgres/docker-compose.yml index c4daa03..a0db319 100644 --- a/Services/postgres/docker-compose.yml +++ b/Services/postgres/docker-compose.yml @@ -1,7 +1,6 @@ server: build: ./ -# image: sx-postgresql - container_name: "sx-postgresql" + container_name: "postgres-server" mem_limit: 1g memswap_limit: 1g cpu_shares: 8 |