From d2b8afc1f219e3db7c776a17c0f03128476ddefa Mon Sep 17 00:00:00 2001 From: startxfr Date: Sat, 28 Nov 2015 05:57:08 +0100 Subject: switching to fedora 23 in master. Start adding docker-compose support --- OS/Centos/Dockerfile | 9 --------- OS/Centos/README.md | 39 --------------------------------------- OS/Dockerfile | 10 ++++++++++ OS/Fedora/Dockerfile | 10 ---------- OS/Fedora/README.md | 37 ------------------------------------- OS/README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ OS/docker-compose.yml | 8 ++++++++ OS/dockerhub_run.sh | 3 --- OS/local_build.sh | 3 --- OS/local_run.sh | 3 --- 10 files changed, 69 insertions(+), 104 deletions(-) delete mode 100644 OS/Centos/Dockerfile delete mode 100644 OS/Centos/README.md create mode 100644 OS/Dockerfile delete mode 100644 OS/Fedora/Dockerfile delete mode 100644 OS/Fedora/README.md create mode 100644 OS/README.md create mode 100644 OS/docker-compose.yml delete mode 100755 OS/dockerhub_run.sh delete mode 100755 OS/local_build.sh delete mode 100755 OS/local_run.sh (limited to 'OS') 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 - -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/Dockerfile b/OS/Dockerfile new file mode 100644 index 0000000..ce00afb --- /dev/null +++ b/OS/Dockerfile @@ -0,0 +1,10 @@ +FROM fedora:latest +MAINTAINER Christophe LARUE + +USER root +# Install minimal packages +RUN dnf -y install deltarpm pwgen tar python-dnf-plugins-extras-migrate && \ + dnf-2 migrate && \ + dnf -y install psmisc coreutils findutils wget logrotate && \ + dnf clean all +RUN mkdir -p /sx diff --git a/OS/Fedora/Dockerfile b/OS/Fedora/Dockerfile deleted file mode 100644 index ce00afb..0000000 --- a/OS/Fedora/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM fedora:latest -MAINTAINER Christophe LARUE - -USER root -# Install minimal packages -RUN dnf -y install deltarpm pwgen tar python-dnf-plugins-extras-migrate && \ - dnf-2 migrate && \ - dnf -y install psmisc coreutils findutils wget logrotate && \ - dnf clean all -RUN mkdir -p /sx diff --git a/OS/Fedora/README.md b/OS/Fedora/README.md deleted file mode 100644 index 3d26fc7..0000000 --- a/OS/Fedora/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# STARTX OS docker-images : Fedora - -Fedora image builded with minimal and updated binaries - -## 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 - - mkdir startx-docker-images; - cd startx-docker-images; - git clone https://github.com/startxfr/docker-images.git . - -Build the container - - docker build -t fedora OS/Fedora/ - -### Running local image - - docker run -it --name="fedora" fedora bash - -## Accessing server - - # Start interactive shell - docker run -it startx/fedora bash - # Start as a daemon - docker run -d startx/fedora bash - docker exec -it fedora /bin/bash - -## Related Resources -* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/fedora) -* [Github STARTX profile](https://github.com/startxfr/docker-images) -* [Docker registry for this container](https://registry.hub.docker.com/u/startx/fedora/) -* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/) \ No newline at end of file diff --git a/OS/README.md b/OS/README.md new file mode 100644 index 0000000..150ba21 --- /dev/null +++ b/OS/README.md @@ -0,0 +1,51 @@ +# STARTX OS docker-images : Fedora + +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 +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/ + +2. 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 + + # Start interactive shell + docker run -it startx/fedora bash + # Start as a daemon + docker run -d startx/fedora bash + docker exec -it fedora /bin/bash + +## Related Resources +* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/fedora) +* [Github STARTX profile](https://github.com/startxfr/docker-images) +* [Docker registry for this container](https://registry.hub.docker.com/u/startx/fedora/) +* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/) \ No newline at end of file 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 -- cgit v1.2.3