REL-0.10 Move to devilbox namespace

Author: cytopia

.travis.yml

@@ -26,8 +26,10 @@ env:
     # travis encrypt DOCKER_USERNAME=user
     # travis encrypt DOCKER_PASSWORD=pass
     # Must be regenerated when repository name/owner changes
-    - secure: "IvbPE2IK4P1pzGtYBKzTeYL1bhy5Zftvb7eJRSOOFjn5eo9r2tH6pMlEJr+aIc4UDGDRBvHAwM8+QzbNa7kaWPwSn9/tMr4xChzfvdNnSre1cHcmkS3uAlqxB1Hs50hQjD/USOzBhzatw4Q3sgb6wZRPfXI6j5Yz4tT6EsjWEQIiCWomE4xmh4N9chqmknVHLXcHElJVUyCndMFmZwRLAWWX799LMkqBXVXZI7Pp8GXoQ/2kN5HPgFDUPeRRT4ykF2iI2zJOdXM63UVgLQr8QBkzpO41llMz0AUl9jLC+N0lPbS1QqPoHsHE0U0Q5jJ6DMYk19W8PzLChFsrHs3kYZloZpMK5IcMV5bY7JNSavMrdbXIm8SOx3EWFMBDwFaxgA0xNYvya5HJ0LugZXLPwg/HrL4oYvMXyUnn6DGLooblanJZ3+3lF/PLewvCvpU2U6OmUevSP9wJ6hnKh4LjaM8pcw68S8DmzLu5sA/RqDATy42LToZdK836g3MBmd9SWdriLgaFeDhdcT1j12aPb060kd9ELh1qawHbxLsT1fV+bUBrc+0oVNrbld5epUP9IDYHjj2UOTiI9cKFSPqUy7iJm1zBXVwzVJ4RXDSd8Y1cB7nA1Mqs2gznxIgk0pT5p7Vaf0ngti5ANaodUoAEN5Bysss+4E/AwiaWFRqBa5I="
-    - secure: "ZcRQGUC1+ykXVAGA7YdFF10EmQrSjwZCabrwZEJxp0HYitdK80UwE/jR4+vCCJarvj8LsvBaVNA0/DZpJPISZfAdrBB+tyqN1Vv0Q9CrEvdpp9lz729eYBwXV6KRHvn9b4XN7OaWPJesBFP+Z/YK+cJ7iUqjv0Jv+tSexMVBiswlztse1bqLNbBo2UnQbz4R3MeLP+KX8uVhXeuUyCpJ26NvTEFuwxnQjsuFY0L5PQkdSOCw6kaSziQMv05w04yfNEOKy6wzqjDb+5oCcHxtRfL9otSCzZmhudaIMEq2stRhMSPT1AD9j7BPfXPRQDZ28peJsMvdGb9TKpj9ww3QIqbvOXaD+vZ338HRn9rc/aqi6Ucd+myjq0UOENxQOxwHJzrXdjYDqxo7LgkUczQb/MPEnkSjPyk9l1CNunsblNGvOFJTU2XatgrP8I07khBFjOI+zBXFFf3HXMwKBZUvXJjBjVZYqBgT/MYKADzrcCUJf9Ynsdfe8N+h9YWAoF+UgHiya/IaG1RTCvRBV5dtYJHAlE/v4/Fv96YpHiESs6HyPZKzQ47ktf9uoB6EUlhpI6OBPYcMjaKGXmQj84hY/q97M6rzJhwm2V+kb+bo+chhlQsjck4cZzkoUpgwiG+yRpjMgxO7Ty0JoZ2+Q2aQBW//hbNm87cH/gBKDFrYEJw="
+    # DOCKER_USERNAME
+    - secure: "gN8Tu2FkCzuLLQHbv0jDZDBgWoBrmrB8uCGk6rcc0QSB96Xedn+wuhD9EK5STfsJDfPMn4HNCs/cfbxzg7K/5F7hTZWgasY7R/L/WlSepn+Z+bwGbAgGLBgqow8ahfSMCvX5Yq/HP6S3YSmv3rWDn63Es4fxIRBEp0j1mOB98rgK9qFjRxey9KyoK55MN4x8NrMAvvqhcrOg1M+MTs4Ju+9tqyCBjwh7r8W7UXhqfQb6R3ln/5CCmbr3jWHuU/2JZSMJ4j89s4Qq1vKSJSKWiCZBlbyfp0KTQEp1i+sSSow8fbjPHIbBa3vZNlNkVl04zBZnDbydDsGhlf9jpa7tD0SbOX+pFBdp2toqzpXBBIMa8tQOCHDnZYDeSbYqmwt/Zh6CfvLCMiyMZ077tpCtqAYwOHyqsUU693trcLludh5sn5YvAsOngqKTyD2dbQ+bCoep3BLfhpv91EMQk7EJN8wh8iYvSBxQbbB2bDHBI3WhGAz38/V2PdaKt5EXVOxnmLELaDuTqusWm1xwQ3CU4hyUkwUabLY8dyIPw4odIfvifmT1j+F/TgqkiNtmmbQ0qOugzas1u8OwpoewKUaL2csf6RXZnJeCms986/wsV2GGb71HzFGCL+rTvl2AerOGJEI/llbtlfMg6xfRpvyj64fxakaDVACeItR/vLtGyNo="
+    # DOCKER_PASSWORD
+    - secure: "ZGYhAW7Cr+Cp0eyWvhB4Ash/6KuN9/7xUr+J0TQEQXAKpLdhwVXV95QA2V5tIRf/+M75OfGZQZcjsnNUkF/5I1N2z8rX4gHaWV8UP0b7OOOF6Z3ICobU3aK6g88UFiIA+GdAakHpCqpxaVxrLbEtTe3XT1R3/O/tf2FpCyxnTiDv9VeFIYwKQKvc8xpBKxjxZtARjy0FMEPRfr0eTn6GCtXcRFCNQK7ZIKEbUxPKp4ZtoXFQ5o+ul5q13KmzQs5QMnETY34wHiuxuKT5lRrZ+k+4IQFxCwjbxvPwjJagWbe3XkRXV7SgW/r+Ocj9l+0M77NOkQn6QlwI4q5LCAANkM+NwkTC6FgRAaytksXTCZcsuem4Zdrp1HbSAXrbgKS//fJd4wjdEpNCLN5MLOCcVgpYBsvZpmW8+b1EivmD4QmavGkN3St4lU0ROydXbVnXWHnbanqBz0H+4HAXY2QmBkf46EznEk/Jjhq7yzSY7q8/OAgSjPHAjhmDIoiUXJJDRTWWtmfC7yv09QbbrLuZFsAxa0JzUL8+inChcY6VuFH6QKBt35NGHjYxIB+yONFaDyHnWFa2EeF8ilxLxnGeUpbi9Mis52G3e4t7vmeolZq3sYGEaf+UNgZtj4ABdQLxkEBt7uF6dn+ojdqSKvV9CdatOtwYy6ElwI011wtT72Q="
   matrix:
     - TEST=0
     - TEST=1

Dockerfile

@@ -8,9 +8,9 @@ MAINTAINER "cytopia" <[email protected]>
 LABEL \
 	name="cytopia's Nginx Image" \
 	image="nginx-mainline" \
-	vendor="cytopia" \
+	vendor="devilbox" \
 	license="MIT" \
-	build-date="2017-09-30"
+	build-date="2017-10-01"
 
 
 ###

README.md

@@ -4,21 +4,21 @@
 
 <sub>This Docker image is part of the **[devilbox](https://github.com/cytopia/devilbox)**.</sub>
 
-**[Apache 2.2](https://github.com/cytopia/docker-apache-2.2) | [Apache 2.4](https://github.com/cytopia/docker-apache-2.4) | [Nginx stable](https://github.com/cytopia/docker-nginx-stable) | Nginx mainline**
+**[Apache 2.2](https://github.com/devilbox/docker-apache-2.2) | [Apache 2.4](https://github.com/devilbox/docker-apache-2.4) | [Nginx stable](https://github.com/devilbox/docker-nginx-stable) | Nginx mainline**
 
-[![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [![](https://images.microbadger.com/badges/version/cytopia/nginx-mainline.svg)](https://microbadger.com/images/cytopia/nginx-mainline "nginx-mainline") [![](https://images.microbadger.com/badges/image/cytopia/nginx-mainline.svg)](https://microbadger.com/images/cytopia/nginx-mainline "nginx-mainline") [![](https://images.microbadger.com/badges/license/cytopia/nginx-mainline.svg)](https://microbadger.com/images/cytopia/nginx-mainline "nginx-mainline")
+[![Build Status](https://travis-ci.org/devilbox/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/devilbox/docker-nginx-mainline) [![](https://images.microbadger.com/badges/version/devilbox/nginx-mainline.svg)](https://microbadger.com/images/devilbox/nginx-mainline "nginx-mainline") [![](https://images.microbadger.com/badges/image/devilbox/nginx-mainline.svg)](https://microbadger.com/images/devilbox/nginx-mainline "nginx-mainline") [![](https://images.microbadger.com/badges/license/devilbox/nginx-mainline.svg)](https://microbadger.com/images/devilbox/nginx-mainline "nginx-mainline")
 
-This image is based on the official **[Nginx (mainline)](https://hub.docker.com/_/nginx/)** Docker image and extends it with the ability to have **virtual hosts created automatically** when adding new directories. For that to work, it integrates two tools that will take care about the whole process: **[watcherd]()** and **[vhost-gen]()**.
+This image is based on the official **[Nginx (mainline)](https://hub.docker.com/_/nginx/)** Docker image and extends it with the ability to have **virtual hosts created automatically** when adding new directories. For that to work, it integrates two tools that will take care about the whole process: **[watcherd](https://github.com/devilbox/watcherd)** and **[vhost-gen](https://github.com/devilbox/vhost-gen)**.
 
 From a users perspective, you mount your local project directory into the Docker under `/shared/httpd`. Any directory then created in your local project directory wil spawn a new virtual host by the same name. Additional settings such as custom server names, PHP-FPM or even different nginx templates per project are supported as well.
 
 ----
 
-Find me on **[Docker Hub](https://hub.docker.com/r/cytopia/nginx-mainline)**:
+Find me on **[Docker Hub](https://hub.docker.com/r/devilbox/nginx-mainline)**:
 
-[![cytopia/nginx-mainline](http://dockeri.co/image/cytopia/nginx-mainline)](https://hub.docker.com/r/cytopia/nginx-mainline/)
+[![devilbox/nginx-mainline](http://dockeri.co/image/devilbox/nginx-mainline)](https://hub.docker.com/r/devilbox/nginx-mainline/)
 
-<small>**Latest build:** 2017-09-30</small>
+<small>**Latest build:** This container is built every night by [travis-ci](https://travis-ci.org/devilbox/docker-nginx-mainline).</small>
 
 ----
 
@@ -170,14 +170,14 @@ Mount your local directort `~/my-host-www` into the docker and server those file
 
 **Note:** Files will be server from `~/my-host-www/htdocs`.
 ```bash
-$ docker run -d -p 80:80 -v ~/my-host-www:/var/www/default -t cytopia/nginx-mainline
+$ docker run -d -p 80:80 -v ~/my-host-www:/var/www/default -t devilbox/nginx-mainline
 ```
 
 #### 2. Serve PHP files with PHP-FPM
 
 Note, for this to work, the `~/my-host-www` dir must be mounted into the Nginx Docker as well as into the php-fpm docker.
 
-You can also attach other PHP-FPM version: [PHP-FPM 5.4](https://github.com/cytopia/docker-php-fpm-5.4), [PHP-FPM 5.5](https://github.com/cytopia/docker-php-fpm-5.5), [PHP-FPM 5.6](https://github.com/cytopia/docker-php-fpm-5.6), [PHP-FPM 7.0](https://github.com/cytopia/docker-php-fpm-7.0) or [PHP-FPM 7.1](https://github.com/cytopia/docker-php-fpm-7.1)
+You can also attach other PHP-FPM version: [PHP-FPM 5.4](https://github.com/cytopia/docker-php-fpm-5.4), [PHP-FPM 5.5](https://github.com/cytopia/docker-php-fpm-5.5), [PHP-FPM 5.6](https://github.com/cytopia/docker-php-fpm-5.6), [PHP-FPM 7.0](https://github.com/cytopia/docker-php-fpm-7.0), [PHP-FPM 7.1](https://github.com/cytopia/docker-php-fpm-7.1), [PHP-FPM 7.2](https://github.com/cytopia/docker-php-fpm-7.2) or [HHVM](https://github.com/cytopia/docker-hhvm-latest).
 
 Each PHP-FPM docker also has the option to enable Xdebug and more, see their respective Readme files for futher settings.
 
@@ -193,7 +193,7 @@ $ docker run -d \
     -e PHP_FPM_SERVER_ADDR=php \
     -e PHP_FPM_SERVER_PORT=9000 \
     --link php \
-    -t cytopia/nginx-mainline
+    -t devilbox/nginx-mainline
 ```
 
 #### 3. Fully functional LEMP stack
@@ -228,7 +228,7 @@ $ docker run -d \
     -e PHP_FPM_SERVER_PORT=9000 \
     --link php \
     --link mysql \
-    -t cytopia/nginx-mainline
+    -t devilbox/nginx-mainline
 ```
 
 #### 4. Ultimate pre-configured docker-compose setup

build/docker-attach.sh

@@ -32,25 +32,32 @@ if [ ! -f "${CWD}/Dockerfile" ]; then
 	exit 1
 fi
 
-# Get docker Name
+# Test Docker name
 if ! grep -q 'image=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
 	echo "No 'image' LABEL found"
 	exit
 fi
 
-# Make sure exactly 1 container is running
+# Test Docker vendor
+if ! grep -q 'vendor=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
+	echo "No 'vendor' LABEL found"
+	exit
+fi
+
+# Retrieve values
 NAME="$( grep 'image=".*"' "${CWD}/Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
-COUNT="$( docker ps | grep -c "cytopia/${NAME}" || true)"
+VEND="$( grep -Eo 'vendor="(.*)"' "${CWD}/Dockerfile" | awk -F'"' '{print $2}' )"
+COUNT="$( docker ps | grep -c "${VEND}/${NAME}" || true)"
 if [ "${COUNT}" != "1" ]; then
-	echo "${COUNT} 'cytopia/${NAME}' container running. Unable to attach."
+	echo "${COUNT} '${VEND}/${NAME}' container running. Unable to attach."
 	exit 1
 fi
 
 
 ###
 ### Attach
 ###
-DID="$(docker ps | grep "cytopia/${NAME}" | awk '{print $1}')"
+DID="$(docker ps | grep "${VEND}/${NAME}" | awk '{print $1}')"
 
-echo "Attaching to: cytopia/${NAME}"
+echo "Attaching to: ${VEND}/${NAME}"
 run "docker exec -it ${DID} env TERM=xterm /bin/bash -l"

build/docker-build.sh

@@ -32,12 +32,21 @@ if [ ! -f "${CWD}/Dockerfile" ]; then
 	exit 1
 fi
 
-# Get docker Name
+# Test Docker name
 if ! grep -q 'image=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
 	echo "No 'image' LABEL found"
 	exit
 fi
+
+# Test Docker vendor
+if ! grep -q 'vendor=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
+	echo "No 'vendor' LABEL found"
+	exit
+fi
+
+# Retrieve values
 NAME="$( grep 'image=".*"' "${CWD}/Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
+VEND="$( grep -Eo 'vendor="(.*)"' "${CWD}/Dockerfile" | awk -F'"' '{print $2}' )"
 DATE="$( date '+%Y-%m-%d' )"
 
 
@@ -53,18 +62,17 @@ run "docker pull ${MY_BASE}"
 ###
 
 # Update build date
-run "sed -i'' 's/<small>\*\*Latest\sbuild.*/<small>**Latest build:** ${DATE}<\/small>/g' ${CWD}/README.md"
 run "sed -i'' 's/build-date=\".*\"/build-date=\"${DATE}\"/g' ${CWD}/Dockerfile"
 
 # Build Docker
-run "docker build -t cytopia/${NAME} ${CWD}"
+run "docker build -t ${VEND}/${NAME} ${CWD}"
 
 
 ###
 ### Retrieve information afterwards and Update README.md
 ###
-docker run -d --rm --name my_tmp_${NAME} -t cytopia/${NAME}
-INFO="$( docker exec my_tmp_${NAME} nginx -V 2>&1 | grep -E '^(nginx|built|TLS)' )"
+docker run -d --rm --name my_tmp_${NAME} -t ${VEND}/${NAME}
+INFO="$( docker exec my_tmp_${NAME} httpd -V | grep -E '^Server.*(version|built|Module|loaded|MPM)' )"
 docker stop "$(docker ps | grep "my_tmp_${NAME}" | awk '{print $1}')" > /dev/null
 
 INFO="$( echo "${INFO}" | sed 's/\s$//g' )"        # remove trailing space

build/docker-enter.sh

@@ -32,15 +32,24 @@ if [ ! -f "${CWD}/Dockerfile" ]; then
 	exit 1
 fi
 
-# Get docker Name
+# Test Docker name
 if ! grep -q 'image=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
 	echo "No 'image' LABEL found"
 	exit
 fi
+
+# Test Docker vendor
+if ! grep -q 'vendor=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
+	echo "No 'vendor' LABEL found"
+	exit
+fi
+
+# Retrieve values
 NAME="$( grep 'image=".*"' "${CWD}/Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
+VEND="$( grep -Eo 'vendor="(.*)"' "${CWD}/Dockerfile" | awk -F'"' '{print $2}' )"
 
 
 ###
 ### Enter
 ###
-run "docker run -i --entrypoint /bin/bash -t cytopia/${NAME}"
+run "docker run -i --entrypoint /bin/bash -t ${VEND}/${NAME}"

build/docker-push.sh

@@ -32,12 +32,21 @@ if [ ! -f "${CWD}/Dockerfile" ]; then
 	exit 1
 fi
 
-# Get docker Name
+# Test Docker name
 if ! grep -q 'image=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
 	echo "No 'image' LABEL found"
 	exit
 fi
+
+# Test Docker vendor
+if ! grep -q 'vendor=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
+	echo "No 'vendor' LABEL found"
+	exit
+fi
+
+# Retrieve values
 NAME="$( grep 'image=".*"' "${CWD}/Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
+VEND="$( grep -Eo 'vendor="(.*)"' "${CWD}/Dockerfile" | awk -F'"' '{print $2}' )"
 DATE="$( date '+%Y-%m-%d' )"
 
 
@@ -53,18 +62,17 @@ run "docker pull ${MY_BASE}"
 ###
 
 # Update build date
-run "sed -i'' 's/<small>\*\*Latest\sbuild.*/<small>**Latest build:** ${DATE}<\/small>/g' ${CWD}/README.md"
 run "sed -i'' 's/build-date=\".*\"/build-date=\"${DATE}\"/g' ${CWD}/Dockerfile"
 
 # Build Docker
-run "docker build --no-cache -t cytopia/${NAME} ${CWD}"
+run "docker build --no-cache -t ${VEND}/${NAME} ${CWD}"
 
 
 ###
 ### Retrieve information afterwards and Update README.md
 ###
-docker run -d --rm --name my_tmp_${NAME} -t cytopia/${NAME}
-INFO="$( docker exec my_tmp_${NAME} nginx -V 2>&1 | grep -E '^(nginx|built|TLS)' )"
+docker run -d --rm --name my_tmp_${NAME} -t ${VEND}/${NAME}
+INFO="$( docker exec my_tmp_${NAME} httpd -V | grep -E '^Server.*(version|built|Module|loaded|MPM)' )"
 docker stop "$(docker ps | grep "my_tmp_${NAME}" | awk '{print $1}')" > /dev/null
 
 INFO="$( echo "${INFO}" | sed 's/\s$//g' )"        # remove trailing space

build/docker-rebuild.sh

@@ -32,12 +32,23 @@ if [ ! -f "${CWD}/Dockerfile" ]; then
 	exit 1
 fi
 
-# Get docker Name
+
+# Test Docker name
 if ! grep -q 'image=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
 	echo "No 'image' LABEL found"
 	exit
 fi
+
+# Test Docker vendor
+if ! grep -q 'vendor=".*"' "${CWD}/Dockerfile" > /dev/null 2>&1; then
+	echo "No 'vendor' LABEL found"
+	exit
+fi
+
+# Retrieve values
 NAME="$( grep 'image=".*"' "${CWD}/Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
+VEND="$( grep -Eo 'vendor="(.*)"' "${CWD}/Dockerfile" | awk -F'"' '{print $2}' )"
+
 
 ###
 ### Run
@@ -46,4 +57,4 @@ _args=""
 if [ "${#}" != "0" ]; then
 	_args="${*}"
 fi
-run "docker run -it ${_args} cytopia/${NAME}"
+run "docker run -it ${_args} ${VEND}/${NAME}"