summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Services/memcache/docker-compose.yml7
-rw-r--r--docker-compose-app.yml7
-rw-r--r--docker-compose-os.yml4
-rw-r--r--docker-compose-sv.yml39
-rw-r--r--docker-compose.yml84
-rwxr-xr-xrun-tests.sh23
6 files changed, 114 insertions, 50 deletions
diff --git a/Services/memcache/docker-compose.yml b/Services/memcache/docker-compose.yml
index 1da4fff..8e657e3 100644
--- a/Services/memcache/docker-compose.yml
+++ b/Services/memcache/docker-compose.yml
@@ -1,8 +1,8 @@
server:
build: ./
container_name: "memcache-server"
- mem_limit: 1.5g
- memswap_limit: 500m
+ mem_limit: 2g
+ memswap_limit: 3g
cpu_shares: 2
restart: "on-failure:2"
environment:
@@ -10,5 +10,4 @@ server:
CONTAINER_SERVICE: "memcache"
CONTAINER_INSTANCE: "service-memcache"
volumes:
- - "/tmp/container/logs/memcache:/data/logs/memcache"
- - "/tmp/container/memcache:/data/memcache" \ No newline at end of file
+ - "/tmp/container/logs/memcache:/data/logs/memcache" \ No newline at end of file
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
new file mode 100644
index 0000000..8f942d4
--- /dev/null
+++ b/docker-compose-app.yml
@@ -0,0 +1,7 @@
+pma:
+ build: Applications/phpmyadmin/
+ container_name: "startx-app-phpmyadmin"
+
+rockmongo:
+ build: Applications/rockmongo/
+ container_name: "startx-app-rockmongo" \ No newline at end of file
diff --git a/docker-compose-os.yml b/docker-compose-os.yml
new file mode 100644
index 0000000..a54ff11
--- /dev/null
+++ b/docker-compose-os.yml
@@ -0,0 +1,4 @@
+fedora:
+ extends:
+ file: OS/docker-compose.yml
+ service: fedora \ No newline at end of file
diff --git a/docker-compose-sv.yml b/docker-compose-sv.yml
new file mode 100644
index 0000000..532ba9e
--- /dev/null
+++ b/docker-compose-sv.yml
@@ -0,0 +1,39 @@
+server_apache:
+ extends:
+ file: Services/apache/docker-compose.yml
+ service: server
+
+server_php:
+ extends:
+ file: Services/php/docker-compose.yml
+ service: server
+
+server_nodejs:
+ extends:
+ file: Services/nodejs/docker-compose.yml
+ service: server
+
+server_mariadb:
+ extends:
+ file: Services/mariadb/docker-compose.yml
+ service: server
+
+server_postgres:
+ extends:
+ file: Services/postgres/docker-compose.yml
+ service: server
+
+server_mongo:
+ extends:
+ file: Services/mongo/docker-compose.yml
+ service: server
+
+server_ooconv:
+ extends:
+ file: Services/ooconv/docker-compose.yml
+ service: server
+
+server_memcache:
+ extends:
+ file: Services/memcache/docker-compose.yml
+ service: server
diff --git a/docker-compose.yml b/docker-compose.yml
index 09f6215..db3ad25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,45 +8,45 @@ server_apache:
file: Services/apache/docker-compose.yml
service: server
-#server_php:
-# extends:
-# file: Services/php/docker-compose.yml
-# service: server
-
-#server_mariadb:
-# extends:
-# file: Services/mariadb/docker-compose.yml
-# service: server
-
-#server_memcache:
-# extends:
-# file: Services/memcache/docker-compose.yml
-# service: server
-
-#server_mongo:
-# extends:
-# file: Services/mongo/docker-compose.yml
-# service: server
-#
-#server_nodejs:
-# extends:
-# file: Services/nodejs/docker-compose.yml
-# service: server
-#
-#server_ooconv:
-# extends:
-# file: Services/ooconv/docker-compose.yml
-# service: server
-
-#server_postgres:
-# extends:
-# file: Services/postgres/docker-compose.yml
-# service: server
-
-#pma:
-# build: Applications/phpmyadmin/
-# container_name: "startx-app-phpmyadmin"
-#
-#rockmongo:
-# build: Applications/rockmongo/
-# container_name: "startx-app-rockmongo" \ No newline at end of file
+server_php:
+ extends:
+ file: Services/php/docker-compose.yml
+ service: server
+
+server_nodejs:
+ extends:
+ file: Services/nodejs/docker-compose.yml
+ service: server
+
+server_mariadb:
+ extends:
+ file: Services/mariadb/docker-compose.yml
+ service: server
+
+server_postgres:
+ extends:
+ file: Services/postgres/docker-compose.yml
+ service: server
+
+server_mongo:
+ extends:
+ file: Services/mongo/docker-compose.yml
+ service: server
+
+server_ooconv:
+ extends:
+ file: Services/ooconv/docker-compose.yml
+ service: server
+
+server_memcache:
+ extends:
+ file: Services/memcache/docker-compose.yml
+ service: server
+
+pma:
+ build: Applications/phpmyadmin/
+ container_name: "startx-app-phpmyadmin"
+
+rockmongo:
+ build: Applications/rockmongo/
+ container_name: "startx-app-rockmongo" \ No newline at end of file
diff --git a/run-tests.sh b/run-tests.sh
index 44caeda..5906beb 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,8 +1,23 @@
#!/bin/bash
+echo "=================> STARTING TEST"
+echo "=================> SETUP TEST ENVIRONMENT"
set -ev
mkdir /tmp/startx-docker-images;
cd /tmp/startx-docker-images;
-git clone https://github.com/startxfr/docker-images.git /tmp/startx-docker-images
-sudo docker-compose build
-sudo docker-compose up -d
-exit 0; \ No newline at end of file
+git clone https://github.com/startxfr/docker-images.git .
+echo "=================> TESTING OS Container"
+sudo docker-compose -f docker-compose-os.yml build
+sudo docker-compose -f docker-compose-os.yml up -d
+echo "=================> TESTING SERVICES Containers"
+sudo docker-compose -f docker-compose-sv.yml build
+sudo docker-compose -f docker-compose-sv.yml up -d
+#echo "=================> TESTING APPLICATIONS Containers"
+#sudo docker-compose -f docker-compose-app.yml build
+#sudo docker-compose -f docker-compose-app.yml up -d
+echo "=================> TEST ENDED SUCCESSFULLY"
+exit 0;
+
+
+
+
+