summaryrefslogtreecommitdiffstats
path: root/OS
diff options
context:
space:
mode:
Diffstat (limited to 'OS')
-rw-r--r--OS/Centos/Dockerfile9
-rw-r--r--OS/Centos/README.md39
-rw-r--r--OS/Dockerfile (renamed from OS/Fedora/Dockerfile)0
-rw-r--r--OS/README.md (renamed from OS/Fedora/README.md)28
-rw-r--r--OS/docker-compose.yml8
-rwxr-xr-xOS/dockerhub_run.sh3
-rwxr-xr-xOS/local_build.sh3
-rwxr-xr-xOS/local_run.sh3
8 files changed, 29 insertions, 64 deletions
diff --git a/OS/Centos/Dockerfile b/OS/Centos/Dockerfile
deleted file mode 100644
index e599305..0000000
--- a/OS/Centos/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM centos:latest
-MAINTAINER Christophe LARUE <dev@startx.fr>
-
-USER root
-# Install minimal packages
-RUN yum -y install deltarpm pwgen tar psmisc \
- && yum -y update \
- && yum clean all \
- && mkdir -p /sx
diff --git a/OS/Centos/README.md b/OS/Centos/README.md
deleted file mode 100644
index 8b97a9c..0000000
--- a/OS/Centos/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# STARTX OS docker-images : Fedora
-==================================
-
-Centos image builded with minimal and updated binaries
-
-
-## Running from docker registry
-
- docker run -it --name="centos" startx/centos
-
-## Build and run from local Dockerfile
-### Building docker image
-Copy sources in your docker host
-
- mkdir startx-docker-images;
- cd startx-docker-images;
- git clone https://github.com/startxfr/docker-images.git .
-
-Build the container
-
- docker build -t centos OS/Centos/
-
-### Running local image
-
- docker run -it --name="centos" centos bash
-
-## Accessing server
-
- # Start interactive shell
- docker run -it startx/centos bash
- # Start as a daemon
- docker run -d startx/centos bash
- docker exec -it centos /bin/bash
-
-## Related Resources
-* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/centos)
-* [Github STARTX profile](https://github.com/startxfr/docker-images)
-* [Docker registry for this container](https://registry.hub.docker.com/u/startx/centos/)
-* [Docker registry for Centos](https://registry.hub.docker.com/u/centos/) \ No newline at end of file
diff --git a/OS/Fedora/Dockerfile b/OS/Dockerfile
index ce00afb..ce00afb 100644
--- a/OS/Fedora/Dockerfile
+++ b/OS/Dockerfile
diff --git a/OS/Fedora/README.md b/OS/README.md
index 3d26fc7..150ba21 100644
--- a/OS/Fedora/README.md
+++ b/OS/README.md
@@ -1,26 +1,40 @@
# STARTX OS docker-images : Fedora
-Fedora image builded with minimal and updated binaries
+Fedora image builded with minimal and updated rpm and core-utils loaded
## Running from docker registry
docker run -it --name="fedora" startx/fedora
## Build and run from local Dockerfile
-### Building docker image
-Copy sources in your docker host
+1. Building docker image
+ # Step 1 : Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
+ # Step 2 : Build the container
+ docker build -t fedora OS/
-Build the container
+2. Running local image
- docker build -t fedora OS/Fedora/
+ docker run -it --name="fedora" fedora bash
-### Running local image
- docker run -it --name="fedora" fedora bash
+## Building and running using docker-compose
+1. Building from source
+
+ # Step 1 : Copy sources in your docker host
+ mkdir startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git startx-docker-images;
+ cd startx-docker-images/OS;
+ # Step 2 : Build the container
+ docker-compose build;
+
+2. Running this service
+
+ docker-compose up -d;
+ docker-compose logs;
## Accessing server
diff --git a/OS/docker-compose.yml b/OS/docker-compose.yml
new file mode 100644
index 0000000..65ce1f3
--- /dev/null
+++ b/OS/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/OS/dockerhub_run.sh b/OS/dockerhub_run.sh
deleted file mode 100755
index 2209c2f..0000000
--- a/OS/dockerhub_run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-docker run -d --name="fedora" startx/fedora /bin/bash
-docker run -d --name="centos" startx/centos /bin/bash \ No newline at end of file
diff --git a/OS/local_build.sh b/OS/local_build.sh
deleted file mode 100755
index 9491a4d..0000000
--- a/OS/local_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-docker build -t fedora OS/Fedora/
-docker build -t centos OS/Centos/ \ No newline at end of file
diff --git a/OS/local_run.sh b/OS/local_run.sh
deleted file mode 100755
index 4d3e435..0000000
--- a/OS/local_run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-docker run -d --name="lbfedora" fedora /bin/bash
-docker run -d --name="lbcentos" centos /bin/bash \ No newline at end of file