summaryrefslogtreecommitdiffstats
path: root/Services
diff options
context:
space:
mode:
Diffstat (limited to 'Services')
-rw-r--r--Services/apache/docker-compose.yml2
-rw-r--r--Services/couchbase/docker-compose.yml2
-rw-r--r--Services/mariadb/docker-compose.yml4
-rw-r--r--Services/memcache/docker-compose.yml2
-rw-r--r--Services/mongo/docker-compose.yml4
-rw-r--r--Services/nodejs/docker-compose.yml2
-rw-r--r--Services/ooconv/docker-compose.yml2
-rw-r--r--Services/php/docker-compose.yml2
-rw-r--r--Services/php/run.sh1
-rw-r--r--Services/postgres/docker-compose.yml4
10 files changed, 13 insertions, 12 deletions
diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml
index 57bacf0..60e4b4f 100644
--- a/Services/apache/docker-compose.yml
+++ b/Services/apache/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "apache-server"
+ container_name: "service-apache"
mem_limit: 500m
memswap_limit: 500m
cpu_shares: 2
diff --git a/Services/couchbase/docker-compose.yml b/Services/couchbase/docker-compose.yml
index 1a23ea5..abb01e0 100644
--- a/Services/couchbase/docker-compose.yml
+++ b/Services/couchbase/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "couchbase-server"
+ container_name: "service-couchbase"
mem_limit: 2g
memswap_limit: 3g
cpu_shares: 2
diff --git a/Services/mariadb/docker-compose.yml b/Services/mariadb/docker-compose.yml
index 29242d7..f1a39ca 100644
--- a/Services/mariadb/docker-compose.yml
+++ b/Services/mariadb/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "mariadb-server"
+ container_name: "service-mariadb"
mem_limit: 1g
memswap_limit: 1g
cpu_shares: 8
@@ -10,7 +10,7 @@ server:
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "mariadb"
- CONTAINER_INSTANCE: "sx-mariadb"
+ CONTAINER_INSTANCE: "service-mariadb"
MYSQL_ROOT_PASSWORD: "secretdemerde"
MYSQL_USER: "user-test"
MYSQL_PASSWORD: "pwd-test"
diff --git a/Services/memcache/docker-compose.yml b/Services/memcache/docker-compose.yml
index a61086d..8368855 100644
--- a/Services/memcache/docker-compose.yml
+++ b/Services/memcache/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "memcache-server"
+ container_name: "service-memcache"
mem_limit: 2g
memswap_limit: 3g
cpu_shares: 2
diff --git a/Services/mongo/docker-compose.yml b/Services/mongo/docker-compose.yml
index 881d75c..427771d 100644
--- a/Services/mongo/docker-compose.yml
+++ b/Services/mongo/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "mongo-server"
+ container_name: "service-mongo"
mem_limit: 2g
memswap_limit: 2g
cpu_shares: 10
@@ -11,7 +11,7 @@ server:
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "mongo"
- CONTAINER_INSTANCE: "sx-mongo"
+ CONTAINER_INSTANCE: "service-mongo"
volumes:
- "/tmp/container/logs/mongodb:/data/logs/mongodb"
- "/tmp/container/mongodb:/data/mongodb" \ No newline at end of file
diff --git a/Services/nodejs/docker-compose.yml b/Services/nodejs/docker-compose.yml
index 2ae018b..b366f76 100644
--- a/Services/nodejs/docker-compose.yml
+++ b/Services/nodejs/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "nodejs-server"
+ container_name: "service-nodejs"
mem_limit: 1g
memswap_limit: 1g
cpu_shares: 5
diff --git a/Services/ooconv/docker-compose.yml b/Services/ooconv/docker-compose.yml
index 64c9f57..b22e23a 100644
--- a/Services/ooconv/docker-compose.yml
+++ b/Services/ooconv/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "ooconv-server"
+ container_name: "service-ooconv"
mem_limit: 2g
memswap_limit: 2g
cpu_shares: 8
diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml
index 22b7585..fe532d9 100644
--- a/Services/php/docker-compose.yml
+++ b/Services/php/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "php-server"
+ container_name: "service-php"
mem_limit: 1g
memswap_limit: 1g
cpu_shares: 5
diff --git a/Services/php/run.sh b/Services/php/run.sh
index 657fbba..1e73c2f 100644
--- a/Services/php/run.sh
+++ b/Services/php/run.sh
@@ -53,6 +53,7 @@ function begin_php_config {
# End configuration process just before starting daemon
function end_php_config {
echo "=> END APACHE + PHP CONFIGURATION"
+ env | grep _ >> /etc/environment
}
check_httpd_environment | tee -a $STARTUPLOG
diff --git a/Services/postgres/docker-compose.yml b/Services/postgres/docker-compose.yml
index ac008c4..5dd37c9 100644
--- a/Services/postgres/docker-compose.yml
+++ b/Services/postgres/docker-compose.yml
@@ -1,6 +1,6 @@
server:
build: ./
- container_name: "postgres-server"
+ container_name: "service-postgres"
mem_limit: 1g
memswap_limit: 1g
cpu_shares: 8
@@ -10,7 +10,7 @@ server:
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "postgresql"
- CONTAINER_INSTANCE: "sx-postgresql"
+ CONTAINER_INSTANCE: "service-postgres"
POSTGRESQL_ROOT_PASSWORD: "secretdemerde"
POSTGRESQL_USER: "user-test"
POSTGRESQL_PASSWORD: "pwd-test"