diff options
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | OS/README.md | 4 | ||||
| -rw-r--r-- | README.md | 74 | ||||
| -rw-r--r-- | run-tests.sh | 13 |
4 files changed, 67 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index f23f5a1..aa18956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,16 +5,8 @@ python: services: - docker -before_install: -- sudo mkdir startx-docker-images; -- sudo cd startx-docker-images; -- sudo git clone https://github.com/startxfr/docker-images.git . -- sudo docker build -t fedora OS/ -- sudo docker run -it --name="fedora" fedora bash -- sudo docker-compose up -d -- sudo docker-compose logs - # command to install dependencies #install: "pip install -r requirements.txt" # command to run tests -script: nosetests +script: ./run-tests.sh + diff --git a/OS/README.md b/OS/README.md index c59ee6a..4f24e9c 100644 --- a/OS/README.md +++ b/OS/README.md @@ -1,8 +1,4 @@ # STARTX OS docker-images : Fedora -[Docker Hub](https://registry.hub.docker.com/u/startx/fedora/) [GitHub](https://github.com/startx/fedora) [](https://travis-ci.org/startxfr/docker-images) - - - Fedora image builded with minimal and updated rpm and core-utils loaded ## Running from docker registry @@ -1,6 +1,6 @@ -# STARTX docker-images repository +# STARTX docker-images repository [](https://travis-ci.org/startxfr/docker-images) -Docker container images all based on red hat like distributions. Actually you can find fedora and centos. +Docker container images all based on red hat like distributions. Actually you can find fedora (from fc20 to fc23) and centos (from 6 to 7). ## Running container from docker registry images @@ -34,33 +34,33 @@ Docker container images all based on red hat like distributions. Actually you ca This repository offer various flavour of Red Hat like distribution. Tag `:latest` is actually pointing to fedora core 20 ### Operating Systems -| OS | Docker Hub repository | Flavour | -|---------------|--------------------------------|------------------------| -| Fedora Core | `startx/fedora` | `:latest` `:20` `:21` | -| CentOS | `startx/centos` | `:6` `:7` | +| OS | Docker Hub repository | Flavour | +|---------------|--------------------------------|------------------------------------| +| Fedora Core | `startx/fedora` | `:latest` `:20` `:21` `:22` `:23` | +| CentOS | `startx/centos` | `:6` `:7` | ### Services -| Service | Docker Hub repository | Fedora | CentOS | -|------------|-----------------------|---------------------------|-----------------------| -| Apache | `startx/sv-apache` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| MariaDB | `startx/sv-mariadb` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| Memcache | `startx/sv-memcache` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| MongoDB | `startx/sv-mongo` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| nodejs | `startx/sv-nodejs` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| ooconv | `startx/sv-ooconv` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| php | `startx/sv-php` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| postgreSQL | `startx/sv-postgres` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| SSH | `startx/sv-ssh` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | +| Service | Docker Hub repository | Fedora | CentOS | +|------------|-----------------------|-------------------------------------------|-----------------------| +| Apache | `startx/sv-apache` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| MariaDB | `startx/sv-mariadb` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| Memcache | `startx/sv-memcache` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| MongoDB | `startx/sv-mongo` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| nodejs | `startx/sv-nodejs` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| ooconv | `startx/sv-ooconv` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| php | `startx/sv-php` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| postgreSQL | `startx/sv-postgres` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| SSH | `startx/sv-ssh` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | ### Applications -| Service | Docker Hub repository | Fedora | CentOS | -|------------|-----------------------|---------------------------|-----------------------| -| PhpMyAdmin | `startx/sv-pma` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | -| RockMongo | `startx/sv-rockmongo` | `:latest` `:fc20` `:fc21` | `:centos6` `:centos7` | +| Service | Docker Hub repository | Fedora | CentOS | +|------------|-----------------------|-------------------------------------------|-----------------------| +| PhpMyAdmin | `startx/sv-pma` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | +| RockMongo | `startx/sv-rockmongo` | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | ### Running sample container's -#### Fedora Core latest (actually fc20) container's +#### Fedora Core latest (actually fc23) container's # For Fedora example, port start from 50100 docker run -d -it --name="fedora" startx/fedora bash @@ -105,6 +105,36 @@ This repository offer various flavour of Red Hat like distribution. Tag `:latest docker run -d -p 50308:80 --name="fedora21-pma" startx/app-pma:fc21 docker run -d -p 50309:80 --name="fedora21-rockmongo" startx/app-rockmongo:fc21 +#### Fedora Core 22 container's + + # For Fedora core 22 example, port start from 50300 + docker run -d -it --name="fedora22" startx/fedora:22 bash + docker run -d -p 50600:80 --name="fedora22-apache" startx/sv-apache:fc22 + docker run -d -p 50601:3306 --name="fedora22-mariadb" startx/sv-mariadb:fc22 + docker run -d -p 50602:11211 --name="fedora22-memcache" startx/sv-memcache:fc22 + docker run -d -p 50603:27017 --name="fedora22-mongo" startx/sv-mongo:fc22 + docker run -d -p 50604:8000 --name="fedora22-nodejs" startx/sv-nodejs:fc22 + docker run -d -p 50605:80 --name="fedora22-php" startx/sv-php:fc22 + docker run -d -p 50606:5432 --name="fedora22-postgres" startx/sv-postgres:fc22 + docker run -d -p 50607:22 --name="fedora22-ssh" startx/sv-ssh:fc22 + docker run -d -p 50608:80 --name="fedora22-pma" startx/app-pma:fc22 + docker run -d -p 50609:80 --name="fedora22-rockmongo" startx/app-rockmongo:fc22 + +#### Fedora Core 23 container's + + # 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 + #### CentOS 6 container's # For CentOS 6 example, port start from 50400 diff --git a/run-tests.sh b/run-tests.sh new file mode 100644 index 0000000..585f279 --- /dev/null +++ b/run-tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -ev +sudo mkdir startx-docker-images; +sudo cd startx-docker-images; +sudo git clone https://github.com/startxfr/docker-images.git . +sudo docker build -t fedora OS/ +sudo docker run -it --name="fedora" fedora bash +sudo docker-compose up -d +sudo docker-compose logs +exit 1; +if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then + exit 0; +fi
\ No newline at end of file |