summaryrefslogtreecommitdiffstats
path: root/OS/README.md
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2017-07-23 13:43:36 +0200
committerstartxfr <clarue@startx.fr>2017-07-23 13:43:36 +0200
commitbaf7c43307fb29f5c19b237f418f4f1a59749c3c (patch)
treef62e6e621a29ef9c71c646efda880f06d44109fd /OS/README.md
parentf499157f393a851909e733c9f259a71b619c0d84 (diff)
downloadphpmyadmin-baf7c43307fb29f5c19b237f418f4f1a59749c3c.tar.gz
phpmyadmin-baf7c43307fb29f5c19b237f418f4f1a59749c3c.tar.bz2
phpmyadmin-baf7c43307fb29f5c19b237f418f4f1a59749c3c.tar.xz
phpmyadmin-baf7c43307fb29f5c19b237f418f4f1a59749c3c.zip
adding openshift OS + Bomb for mem and cpu crash test on openshift
Diffstat (limited to 'OS/README.md')
-rw-r--r--OS/README.md32
1 files changed, 12 insertions, 20 deletions
diff --git a/OS/README.md b/OS/README.md
index d776462..ff1d247 100644
--- a/OS/README.md
+++ b/OS/README.md
@@ -1,43 +1,35 @@
-# Docker OS Images : FEDORA
+# Docker OS Images : Centos7
-Simple container used for all startx based services and applications published in [Dockerhub registry](https://github.com/startxfr/docker-images).
-This container contain updated core OS rpm (kernel, libs,...) as well as usefull tools like pwgen, tar, zip, psmisc, procps, coreutils, findutils, wget
-
-| [![Build Status](https://travis-ci.org/startxfr/docker-images.svg?branch=master)](https://travis-ci.org/startxfr/docker-images) | [Dockerhub Registry](https://hub.docker.com/r/startx/fedora) | [Sources](https://github.com/startxfr/docker-images/OS/) | [STARTX Profile](https://github.com/startxfr) |
-|-------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|----------------------------------------------------------------------|-----------------------------------------------|
+Simple container used to have an os container running in openshift and ready to investigate using sysadmin tools. This image is based on [centos/s2i-core-centos7](https://hub.docker.com/r/centos/s2i-core-centos7) done by [sclorg](https://github.com/sclorg/s2i-base-container/tree/master/core). Official image for all openshift s2i containers.
+You can find information on this image and how to use it by visiting the [Dockerhub registry](https://github.com/startxfr/docker-images)
-## Container flavours
+This container contain updated core OS rpm (kernel, libs,...) as well as usefull tools like pwgen, tar, zip, psmisc, procps, coreutils, findutils, wget
-| Version | Docker Hub repository | Fedora distribution |
-|------------|-------------------------------------------------------------------------|---------------------------------------------|
-| Latest | [`startx/fedora:latest`](https://hub.docker.com/r/startx/fedora) | Fedora 24 (kernel 4.x + GNU 3.xx ) |
-| 23 | [`startx/fedora:23`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) |
-| 22 | [`startx/fedora:22`](https://hub.docker.com/r/startx/fedora) | Fedora 22 (kernel 4.0 + GNU 3.16 ) |
-| 21 | [`startx/fedora:21`](https://hub.docker.com/r/startx/fedora) | Fedora 21 (kernel 3.16 + GNU 3.14 ) |
-| 20 | [`startx/fedora:20`](https://hub.docker.com/r/startx/fedora) | Fedora 20 (kernel 3.11 + GNU 3.10 ) |
+| [![Build Status](https://travis-ci.org/startxfr/docker-images.svg?branch=openshift)](https://travis-ci.org/startxfr/docker-images) | [Dockerhub Registry](https://hub.docker.com/r/startx/openshift-centos) | [Sources](https://github.com/startxfr/docker-images/OS/) | [STARTX Profile](https://github.com/startxfr) |
+|-------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------|----------------------------------------------------------------------|-----------------------------------------------|
## Running from dockerhub registry
-* with `docker` you can run `docker run -it --name="fedora" startx/fedora` from any docker host
+* with `docker` you can run `docker run -it --name="centos" startx/openshift-centos` from any docker host
* with `docker-compose` you can create a docker-compose.yml file with the following content
```
fedora:
- image: startx/fedora:latest
- container_name: "os-fedora"
+ image: startx/openshift-centos:latest
+ container_name: "os-ocp-centos7"
environment:
CONTAINER_TYPE: "os"
CONTAINER_SERVICE: "fedora"
- CONTAINER_INSTANCE: "os-fedora"
+ CONTAINER_INSTANCE: "os-ocp-centos7"
```
## Using this image in your own container
You can use this Dockerfile template to start a new personalized container based on this container
```
-FROM startx/fedora:latest
+FROM startx/openshift-centos:latest
#... your container specifications
-CMD ["/bin/run.sh"]
+CMD ["/bin/sx"]
```
## Environment variable