summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Applications/README.md16
-rw-r--r--OS/README.md12
-rw-r--r--README.md10
-rw-r--r--Services/README.md40
4 files changed, 40 insertions, 38 deletions
diff --git a/Applications/README.md b/Applications/README.md
index 4dd79ce..04d2f6f 100644
--- a/Applications/README.md
+++ b/Applications/README.md
@@ -28,10 +28,10 @@ your project and start using stable or experimental applications in your applica
## Available applications
-| Service | Docker Hub repository | Fedora | CentOS | Doc |
-|-----------------|---------------------------------------------------------------------------|-------------------------------------------|-------------------------|---------------------------------------------------------|
-| PhpMyAdmin | [`startx/app-pma`](https://hub.docker.com/r/startx/app-pma) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Applications/pma/README.md) |
-| RockMongo | [`startx/app-rockmongo`](https://hub.docker.com/r/startx/app-rockmongo) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Applications/rockmongo/README.md) |
+| Service | Docker Hub repository | Fedora flavours | CentOS flavours | Doc |
+|-----------------|---------------------------------------------------------------------------|-----------------------------------|-----------------|---------------------------------------------------------|
+| PhpMyAdmin | [`startx/app-pma`](https://hub.docker.com/r/startx/app-pma) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Applications/pma/README.md) |
+| RockMongo | [`startx/app-rockmongo`](https://hub.docker.com/r/startx/app-rockmongo) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Applications/rockmongo/README.md) |
## Running from dockerhub registry
@@ -43,7 +43,7 @@ your project and start using stable or experimental applications in your applica
## Container flavours
-| 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` |
+| Service | Docker Hub repository | Fedora | CentOS |
+|------------|-------------------------------------------------------------------------|-------------------------------------------|-----------------------|
+| PhpMyAdmin | [`startx/app-pma`](https://hub.docker.com/r/startx/app-pma) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| RockMongo | [`startx/app-rockmongo`](https://hub.docker.com/r/startx/app-rockmongo) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
diff --git a/OS/README.md b/OS/README.md
index e8e806d..17b5720 100644
--- a/OS/README.md
+++ b/OS/README.md
@@ -18,11 +18,13 @@ This container contain updated core OS rpm (kernel, libs,...) as well as usefull
## Container flavours
-* `:latest` : Fedora core 23 at this time
-* `:23` : Fedora core 23
-* `:22` : Fedora core 22
-* `:21` : Fedora core 21
-* `:20` : Fedora core 20
+| Version | Docker Hub repository | Fedora distribution |
+|------------|-------------------------------------------------------------------------|---------------------------------------------|
+| Latest | [`startx/fedora`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) |
+| 23 | [`startx/fedora`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) |
+| 22 | [`startx/fedora`](https://hub.docker.com/r/startx/fedora) | Fedora 22 (kernel 4.0 + GNU 3.16 ) |
+| 21 | [`startx/fedora`](https://hub.docker.com/r/startx/fedora) | Fedora 21 (kernel 3.16 + GNU 3.14 ) |
+| 20 | [`startx/fedora`](https://hub.docker.com/r/startx/fedora) | Fedora 20 (kernel 3.11 + GNU 3.10 ) |
## Running from dockerhub registry
diff --git a/README.md b/README.md
index 6179fbc..35af04f 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ your project and start using stable or experimental services in your application
## OS, Services and Applications guidelines
-| Type | Manual | Available | Running sample | Flavours
-|------------------|-----------------------------|-------------------------------------------------|--------------------------------------------------------------|-------------------------------------------------|
-| **OS** | [read manual](OS) | [read section](OS#container-flavours) | [OS](OS#running-from-dockerhub-registry) | [OS](OS#container-flavours) |
-| **Services** | [read manual](Services) | [read section](Services#container-flavours) | [Services](Services#running-from-dockerhub-registry) | [Services](Services#container-flavours) |
-| **Applications** | [read manual](Applications) | [read section](Applications#container-flavours) | [Applications](Applications#running-from-dockerhub-registry) | [Applications](Applications#container-flavours) |
+| Type | Manual | Available | Running sample | Flavours
+|------------------|-----------------------------|-----------------------------------------------------------|-----------------------------------------------------------------|------------------------------------------------------|
+| **OS** | [read manual](OS) | [read OS list](OS#container-flavours) | [see sample code](OS#running-from-dockerhub-registry) | [read flavours list](OS#container-flavours) |
+| **Services** | [read manual](Services) | [read services list](Services#container-flavours) | [see sample code](Services#running-from-dockerhub-registry) | [read flavours list](Services#container-flavours) |
+| **Applications** | [read manual](Applications) | [read applications list](Applications#container-flavours) | [see sample code](Applications#running-from-dockerhub-registry) | [read flavours list](Applications#container-flavours)|
## For advanced users
diff --git a/Services/README.md b/Services/README.md
index 7fb0067..a8ea7fa 100644
--- a/Services/README.md
+++ b/Services/README.md
@@ -28,16 +28,16 @@ your project and start using stable or experimental services in your application
## Available services
-| Service | Docker Hub repository | Fedora | CentOS | Doc |
-|---------------|---------------------------------------------------------------------|-------------------------------------------|-------------------------|---------------------------------------------------|
-| Apache | [`startx/sv-apache`](https://hub.docker.com/r/startx/sv-apache) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/apache/README.md) |
-| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/mariadb/README.md) |
-| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/memcache/README.md) |
-| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/mongo/README.md) |
-| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/nodejs/README.md) |
-| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/ooconv/README.md) |
-| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/php/README.md) |
-| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` | [manual](Services/postgres/README.md) |
+| Service | Docker Hub repository | Fedora flavours | CentOS flavours | Doc |
+|---------------|---------------------------------------------------------------------|-----------------------------------|-----------------|---------------------------------------------------|
+| Apache | [`startx/sv-apache`](https://hub.docker.com/r/startx/sv-apache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/apache/README.md) |
+| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/mariadb/README.md) |
+| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/memcache/README.md) |
+| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/mongo/README.md) |
+| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/nodejs/README.md) |
+| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/ooconv/README.md) |
+| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/php/README.md) |
+| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](Services/postgres/README.md) |
## Running from dockerhub registry
@@ -55,13 +55,13 @@ your project and start using stable or experimental services in your application
## Container flavours
-| 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` |
+| Service | Docker Hub repository | Fedora | CentOS |
+|------------|----------------------------------------------------------------------|----------------------------------------------|-----------------------|
+| Apache | [`startx/sv-apache`](https://hub.docker.com/r/startx/sv-apache) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |