summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-28 07:32:39 +0100
committerstartxfr <clarue@startx.fr>2015-11-28 07:32:39 +0100
commit96716ec932f74a04bc9c8bf52e038f0a2705c654 (patch)
treef7e247fc41c4defa06691ae05f6de19aad4cbfbe
parent41d6c788a9b2e740ab9e023664da7e7d77f5afdc (diff)
downloadphpmyadmin-96716ec932f74a04bc9c8bf52e038f0a2705c654.tar.gz
phpmyadmin-96716ec932f74a04bc9c8bf52e038f0a2705c654.tar.bz2
phpmyadmin-96716ec932f74a04bc9c8bf52e038f0a2705c654.tar.xz
phpmyadmin-96716ec932f74a04bc9c8bf52e038f0a2705c654.zip
adding travis
-rw-r--r--Applications/rockmongo/Dockerfile6
-rw-r--r--docker-compose.yml55
-rwxr-xr-xrun-tests.sh6
3 files changed, 51 insertions, 16 deletions
diff --git a/Applications/rockmongo/Dockerfile b/Applications/rockmongo/Dockerfile
index a934d41..ca5da28 100644
--- a/Applications/rockmongo/Dockerfile
+++ b/Applications/rockmongo/Dockerfile
@@ -1,10 +1,6 @@
-
-
-FROM openshift/centos-rockmongo:latest
+FROM startx/sv-php
MAINTAINER startx dev@startx.fr
-
-
# update, install required, clean
RUN yum -y update && yum install -y httpd php php-devel wget php-pear unzip gcc-c++ make && yum clean all
diff --git a/docker-compose.yml b/docker-compose.yml
index 65ce1f3..45bea51 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,47 @@
-server:
- build: ./
-# image: sx-fedora
- container_name: "sx-fedora"
- mem_limit: 1g
- memswap_limit: 2g
- cpu_shares: 4096
- restart: "on-failure:2" \ No newline at end of file
+fedora:
+ build: OS/
+ container_name: "startx-fedora"
+
+apache:
+ build: Services/apache/
+ container_name: "startx-sv-apache"
+
+mariadb:
+ build: Services/mariadb/
+ container_name: "startx-sv-mariadb"
+
+memcache:
+ build: Services/memcache/
+ container_name: "startx-sv-memcache"
+
+mongo:
+ build: Services/mongo/
+ container_name: "startx-sv-mongo"
+
+nodejs:
+ build: Services/nodejs/
+ container_name: "startx-sv-nodejs"
+
+ooconv:
+ build: Services/ooconv/
+ container_name: "startx-sv-ooconv"
+
+php:
+ build: Services/php/
+ container_name: "startx-sv-php"
+
+postgres:
+ build: Services/postgres/
+ container_name: "startx-sv-postgres"
+
+ssh:
+ build: Services/ssh/
+ container_name: "startx-sv-ssh"
+
+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 585f279..c8fd72d 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,8 +1,8 @@
#!/bin/bash
set -ev
-sudo mkdir startx-docker-images;
-sudo cd startx-docker-images;
-sudo git clone https://github.com/startxfr/docker-images.git .
+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 build -t fedora OS/
sudo docker run -it --name="fedora" fedora bash
sudo docker-compose up -d