diff options
| author | startxfr <clarue@startx.fr> | 2015-11-28 07:23:53 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-11-28 07:23:53 +0100 |
| commit | 41d6c788a9b2e740ab9e023664da7e7d77f5afdc (patch) | |
| tree | 78b0d30d0ad33c6b4a6691738e7b8932a648a882 | |
| parent | d756ad578a856c24bd06340329d5aceb9806e777 (diff) | |
| download | phpmyadmin-41d6c788a9b2e740ab9e023664da7e7d77f5afdc.tar.gz phpmyadmin-41d6c788a9b2e740ab9e023664da7e7d77f5afdc.tar.bz2 phpmyadmin-41d6c788a9b2e740ab9e023664da7e7d77f5afdc.tar.xz phpmyadmin-41d6c788a9b2e740ab9e023664da7e7d77f5afdc.zip | |
adding travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | docker-compose.yml | 8 | ||||
| -rwxr-xr-x | local_build.sh | 4 | ||||
| -rwxr-xr-x | local_run.sh | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | run-tests.sh | 0 |
6 files changed, 18 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index aa18956..4fa837e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ python: services: - docker -# command to install dependencies -#install: "pip install -r requirements.txt" # command to run tests script: ./run-tests.sh @@ -124,16 +124,16 @@ This repository offer various flavour of Red Hat like distribution. Tag `:latest # For Fedora core 23 example, port start from 50300 docker run -d -it --name="fedora23" startx/fedora:23 bash - docker run -d -p 50600:80 --name="fedora23-apache" startx/sv-apache:fc23 - docker run -d -p 50601:3306 --name="fedora23-mariadb" startx/sv-mariadb:fc23 - docker run -d -p 50602:11211 --name="fedora23-memcache" startx/sv-memcache:fc23 - docker run -d -p 50603:27017 --name="fedora23-mongo" startx/sv-mongo:fc23 - docker run -d -p 50604:8000 --name="fedora23-nodejs" startx/sv-nodejs:fc23 - docker run -d -p 50605:80 --name="fedora23-php" startx/sv-php:fc23 - docker run -d -p 50606:5432 --name="fedora23-postgres" startx/sv-postgres:fc23 - docker run -d -p 50607:22 --name="fedora23-ssh" startx/sv-ssh:fc23 - docker run -d -p 50608:80 --name="fedora23-pma" startx/app-pma:fc23 - docker run -d -p 50609:80 --name="fedora23-rockmongo" startx/app-rockmongo:fc23 + docker run -d -p 50700:80 --name="fedora23-apache" startx/sv-apache:fc23 + docker run -d -p 50701:3306 --name="fedora23-mariadb" startx/sv-mariadb:fc23 + docker run -d -p 50702:11211 --name="fedora23-memcache" startx/sv-memcache:fc23 + docker run -d -p 50703:27017 --name="fedora23-mongo" startx/sv-mongo:fc23 + docker run -d -p 50704:8000 --name="fedora23-nodejs" startx/sv-nodejs:fc23 + docker run -d -p 50705:80 --name="fedora23-php" startx/sv-php:fc23 + docker run -d -p 50706:5432 --name="fedora23-postgres" startx/sv-postgres:fc23 + docker run -d -p 50707:22 --name="fedora23-ssh" startx/sv-ssh:fc23 + docker run -d -p 50708:80 --name="fedora23-pma" startx/app-pma:fc23 + docker run -d -p 50709:80 --name="fedora23-rockmongo" startx/app-rockmongo:fc23 #### CentOS 6 container's diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..65ce1f3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +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 diff --git a/local_build.sh b/local_build.sh deleted file mode 100755 index 67dfb0e..0000000 --- a/local_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -cd OS; docker-compose build; cd -; -Services/local_build.sh -Applications/local_build.sh
\ No newline at end of file diff --git a/local_run.sh b/local_run.sh deleted file mode 100755 index 010a4d9..0000000 --- a/local_run.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -cd OS; docker-compose up -d; cd -; -Services/local_run.sh -Applications/local_run.sh
\ No newline at end of file diff --git a/run-tests.sh b/run-tests.sh index 585f279..585f279 100644..100755 --- a/run-tests.sh +++ b/run-tests.sh |