Merge pull request #15 from million12/develop

Volumes fix and Migrated from CircleCI to Travis

.gitignore

@@ -0,0 +1,2 @@
+.idea/
+/docker-centos-supervisor.iml

.travis.yml

@@ -0,0 +1,31 @@
+services:
+  - docker
+
+jobs:
+  include:
+    - stage: build&test
+      script:
+        # Build Centos version
+        - docker build -t million12/centos-supervisor:stage centos/
+        # Build Alpine Version
+        - echo "TBA"
+        - docker run -d --name centos million12/centos-supervisor:stage && sleep 5 
+        # Test if supervisord is running
+        - while true; do if docker logs centos | grep "supervisord started with pid"; then break; else sleep 1; fi done
+        # Test if supervisorctl is working
+        - docker exec -i centos bash -c "supervisorctl version"
+        # Test if we have inotify working
+        - docker exec -i centos bash -c "inotifywatch -t 1 /home | tee /tmp/out"
+        # Cahce Image on Docker Hub
+        - docker login -u $DOCKER_USER -p $DOCKER_PASS
+        - docker push million12/centos-supervisor:stage
+
+    - stage: deploy
+      if: branch = master
+      script:
+        - docker login -u $DOCKER_USER -p $DOCKER_PASS
+        - docker pull million12/centos-supervisor:stage
+        - docker tag million12/centos-supervisor:stage million12/centos-supervisor:latest
+        - RELEASE=$(grep "SUPERVISOR_VERSION=" centos/Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker tag million12/centos-supervisor:latest million12/centos-supervisor:${RELEASE}
+        - docker push million12/centos-supervisor:latest
+        - RELEASE=$(grep "SUPERVISOR_VERSION=" centos/Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker push million12/centos-supervisor:${RELEASE}

README.md

@@ -1,13 +1,14 @@
 # CentOS-7 with supervisord launcher | Docker
-[![CircleCI Build Status](https://img.shields.io/circleci/project/million12/docker-centos-supervisor/master.svg)](https://circleci.com/gh/million12/docker-centos-supervisor)
+[![Build Status](https://travis-ci.org/million12/docker-centos-supervisor.svg?branch=master)](https://travis-ci.org/million12/docker-centos-supervisor)
 [![GitHub Open Issues](https://img.shields.io/github/issues/million12/docker-centos-supervisor.svg)](https://github.com/million12/docker-centos-supervisor/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/million12/docker-centos-supervisor.svg)](https://github.com/million12/docker-centos-supervisor)
 [![GitHub Forks](https://img.shields.io/github/forks/million12/docker-centos-supervisor.svg)](https://github.com/million12/docker-centos-supervisor)  
 [![Stars on Docker Hub](https://img.shields.io/docker/stars/million12/centos-supervisor.svg)](https://hub.docker.com/r/million12/centos-supervisor)
 [![Pulls on Docker Hub](https://img.shields.io/docker/pulls/million12/centos-supervisor.svg)](https://hub.docker.com/r/million12/centos-supervisor)  
-[![Docker Layers](https://badge.imagelayers.io/million12/centos-supervisor:latest.svg)](https://hub.docker.com/r/million12/centos-supervisor)
+[![](https://img.shields.io/github/release/million12/docker-centos-supervisor.svg)](http://microbadger.com/images/million12/docker-centos-supervisor)  
+[![Docker build](http://dockeri.co/image/million12/centos-supervisor)](https://hub.docker.com/r/million12/centos-supervisor/)
 
-This is a CentOS-7 Docker [million12/centos-supervisor](https://registry.hub.docker.com/u/million12/centos-supervisor/) image, perfect in case when you need to launch more then one process inside a container. This image is based on official [centos:centos7](https://registry.hub.docker.com/_/centos/) and it adds only ca. 20MB on top of it.
+This is a CentOS-7 Docker [million12/centos-supervisor](https://registry.hub.docker.com/u/million12/centos-supervisor/) image, perfect in case when you need to launch more then one process inside a container. This image is based on official [centos:centos7](https://registry.hub.docker.com/_/centos/) with basic debugging tools.
 
 ## What's included
 
@@ -50,6 +51,16 @@ Recommended structure:
 /data/www/ # your web application data
 ```
 
+##### - additional tools
+
+- `jq`
+- `rsync`
+- `telnet`
+- `htop`
+- `atop`
+- `iotop`
+- `mtr`
+- `vim`
 
 ## Usage
 
@@ -71,12 +82,9 @@ As explained above, this container is configured to run your service(s) both in
 `docker build --tag=million12/centos-supervisor .`
 
 
-## Author
+## Authors
 
 Author: Marcin Ryzycki (<[email protected]>)  
 Author: Przemyslaw Ozgo (<[email protected]>)  
 This work is also inspired by [maxexcloo](https://github.com/maxexcloo)'s work on his [docker images](https://github.com/maxexcloo/Docker). Many thanks!
 
----
-
-**Sponsored by [Prototype Brewery](http://prototypebrewery.io/)** - the new prototyping tool for building highly-interactive prototypes of your website or web app. Built on top of [Neos CMS](https://www.neos.io/) and [Zurb Foundation](http://foundation.zurb.com/) framework.

centos/Dockerfile

@@ -0,0 +1,34 @@
+FROM centos:centos7
+
+ENV SUPERVISOR_VERSION=4.0.2
+
+RUN \
+  rpm --rebuilddb && yum clean all; \
+  yum install -y epel-release; \
+  yum update -y; \
+  yum install -y \
+    iproute \
+    python-setuptools \
+    hostname \
+    inotify-tools \
+    yum-utils \
+    which \
+    jq \
+    rsync \
+    telnet \
+    htop \
+    atop \
+    iotop \
+    mtr \
+    vim && \
+  yum clean all && rm -rf /tmp/yum*; \
+  easy_install pip; \
+  pip install supervisor==${SUPERVISOR_VERSION}
+
+ADD container-files /
+
+VOLUME ["/data"]
+
+ENTRYPOINT ["/config/bootstrap.sh"]
+
+EXPOSE 9111

container-files/config/bootstrap.sh → centos/container-files/config/bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -u