REL-0.10 Consolidate conf dirs with other httpd Docker

Author: cytopia

Dockerfile

@@ -10,7 +10,7 @@ LABEL \
 	image="nginx-mainline" \
 	vendor="cytopia" \
 	license="MIT" \
-	build-date="2017-09-27"
+	build-date="2017-09-28"
 
 
 ###
@@ -20,6 +20,7 @@ LABEL \
 # required packages
 RUN set -x \
 	&& apt-get update \
+	&& apt-get upgrade -y \
 	&& apt-get install --no-install-recommends --no-install-suggests -y \
 		make \
 		python-yaml \
@@ -48,18 +49,19 @@ RUN set -x \
 	&& apt-get remove -y \
 		make \
 		wget \
+	&& apt-get autoremove -y \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& apt-get purge -y --auto-remove
 
 # Add custom config directive to httpd server
 RUN set -x \
-	&& sed -i'' 's|^\s*include.*conf\.d/.*|    include /etc/nginx-mainline.d/*.conf;\n    include /etc/nginx/conf.d/*.conf;\n    include /etc/nginx/custom.d/*.conf;\n|g' /etc/nginx/nginx.conf
+	&& sed -i'' 's|^\s*include.*conf\.d/.*|    include /etc/httpd-custom.d/*.conf;\n    include /etc/httpd/conf.d/*.conf;\n    include /etc/httpd/vhost.d/*.conf;\n|g' /etc/nginx/nginx.conf
 
 # create directories
 RUN set -x \
-	&& rm -rf /etc/nginx/conf.d/* \
-	&& mkdir -p /etc/nginx-mainline.d \
-	&& mkdir -p /etc/nginx/custom.d \
+	&& mkdir -p /etc/httpd-custom.d \
+	&& mkdir -p /etc/httpd/conf.d \
+	&& mkdir -p /etc/httpd/vhost.d \
 	&& mkdir -p /var/www/default/htdocs \
 	&& mkdir -p /shared/httpd \
 	&& chmod 0775 /shared/httpd \

README.md

@@ -18,7 +18,7 @@ Find me on **[Docker Hub](https://hub.docker.com/r/cytopia/nginx-mainline)**:
 
 [![cytopia/nginx-mainline](http://dockeri.co/image/cytopia/nginx-mainline)](https://hub.docker.com/r/cytopia/nginx-mainline/)
 
-<small>**Latest build:** 2017-09-27</small>
+<small>**Latest build:** 2017-09-28</small>
 
 ----
 
@@ -120,7 +120,7 @@ This Docker container adds a lot of injectables in order to customize it to your
 | DEBUG_RUNTIME       | bool   | `0`     | Be verbose during runtime.<br/>Value: `0` or `1` |
 | DOCKER_LOGS         | bool   | `0`     | When set to `1` will redirect error and access logs to Docker logs (`stderr` and `stdout`) instead of file inside container.<br/>Value: `0` or `1` |
 | TIMEZONE            | string | `UTC`   | Set docker OS timezone.<br/>(Example: `Europe/Berlin`) |
-| NEW_UID             | int    | `101`   | Assign the default nginx user a new UID. This is useful if you you mount your document root and want to match the file permissions to the one of your local user. Set it to your host users uid (see `id` for your uid). |
+| NEW_UID             | int    | `101`   | Assign the default Nginx user a new UID. This is useful if you you mount your document root and want to match the file permissions to the one of your local user. Set it to your host users uid (see `id` for your uid). |
 | NEW_GID             | int    | `101`   | This is useful if you you mount your document root and want to match the file permissions to the one of your local user group. Set it to your host user groups gid (see `id` for your gid). |
 | PHP_FPM_ENABLE      | bool   | `0`     | Enable PHP-FPM for the default vhost and the mass virtual hosts. |
 | PHP_FPM_SERVER_ADDR | string | ``      | IP address or hostname of remote PHP-FPM server.<br/><strong>Required when enabling PHP.</strong> |
@@ -150,7 +150,7 @@ This Docker container adds a lot of injectables in order to customize it to your
 
 | Docker              | Description |
 |---------------------|-------------|
-| /etc/nginx-stable.d | Mount this directory to add outside configuration files (`*.conf`) to nginx |
+| /etc/httpd-custom.d | Mount this directory to add outside configuration files (`*.conf`) to Nginx |
 | /var/www/default    | Nginx default virtual host base path (contains by default `htdocs/` and `cfg/` |
 | /shared/httpd       | Nginx mass virtual host root directory |
 
@@ -175,7 +175,7 @@ $ docker run -d -p 80:80 -v ~/my-host-www:/var/www/default -t cytopia/nginx-main
 
 #### 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.
+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)
 
@@ -185,7 +185,7 @@ Each PHP-FPM docker also has the option to enable Xdebug and more, see their res
 # Start the PHP-FPM docker, mounting the same diectory
 $ docker run -d -p 9000 -v ~/my-host-www:/var/www/default --name php cytopia/php-fpm-5.6
 
-# Start the Nginx docker, linking it to the PHP-FPM docker
+# Start the Nginx Docker, linking it to the PHP-FPM docker
 $ docker run -d \
     -p 80:80 \
     -v ~/my-host-www:/var/www/default \
@@ -219,7 +219,7 @@ $ docker run -d \
     --name php \
     cytopia/php-fpm-5.6
 
-# Start the Nginx docker, linking it to the PHP-FPM docker
+# Start the Nginx Docker, linking it to the PHP-FPM docker
 $ docker run -d \
     -p 80:80 \
     -v ~/my-host-www:/var/www/default \

build/docker-build.sh

@@ -63,10 +63,9 @@ run "docker build -t cytopia/${NAME} ${CWD}"
 ###
 ### Retrieve information afterwards and Update README.md
 ###
-docker run -d --name my_tmp_${NAME} -t cytopia/${NAME}
+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 stop "$(docker ps | grep "my_tmp_${NAME}" | awk '{print $1}')"
-docker rm "my_tmp_${NAME}"
+docker stop "$(docker ps | grep "my_tmp_${NAME}" | awk '{print $1}')" > /dev/null
 
 INFO="$( echo "${INFO}" | sed 's/\s$//g' )"        # remove trailing space
 echo "${INFO}"

build/docker-rebuild.sh

@@ -63,10 +63,9 @@ run "docker build --no-cache -t cytopia/${NAME} ${CWD}"
 ###
 ### Retrieve information afterwards and Update README.md
 ###
-docker run -d --name my_tmp_${NAME} -t cytopia/${NAME}
+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 stop "$(docker ps | grep "my_tmp_${NAME}" | awk '{print $1}')"
-docker rm "my_tmp_${NAME}"
+docker stop "$(docker ps | grep "my_tmp_${NAME}" | awk '{print $1}')" > /dev/null
 
 INFO="$( echo "${INFO}" | sed 's/\s$//g' )"        # remove trailing space
 echo "${INFO}"

data/docker-entrypoint.sh

@@ -266,7 +266,7 @@ if [ "${_RUNTIME_MAIN_VHOST_STATUS_ENABLE}" -eq "1" ]; then
 	if ! set | grep '^MAIN_VHOST_STATUS_ALIAS=' >/dev/null 2>&1; then
 		log "info" "\$MAIN_VHOST_STATUS_ALIAS not specified. Keeping default: ${_RUNTIME_MAIN_VHOST_STATUS_ALIAS}."
 	else
-		log "info" "Setting httpd status page to: '\$MAIN_VHOST_STATUS_ALIAS'"
+		log "info" "Setting httpd status page to: '${MAIN_VHOST_STATUS_ALIAS}'"
 		_RUNTIME_MAIN_VHOST_STATUS_ALIAS="${MAIN_VHOST_STATUS_ALIAS}"
 	fi
 fi

data/supervisord.conf

@@ -14,7 +14,7 @@ stdout_events_enabled=true
 stderr_events_enabled=true
 
 [program:watcherd]
-command=watcherd -v -p /shared/httpd -a "vhost_gen.py -p %%p -n %%n -o %%p/__MASS_VHOST_TPL__/ -s __VERBOSE__" -d "rm /etc/nginx/custom.d/%%n.conf" -t "nginx -s reload"
+command=watcherd -v -p /shared/httpd -a "vhost_gen.py -p %%p -n %%n -o %%p/__MASS_VHOST_TPL__/ -s __VERBOSE__" -d "rm /etc/httpd/vhost.d/%%n.conf" -t "nginx -s reload"
 #startsecs = 0
 #autorestart = false
 #startretries = 1

data/vhost-gen/conf.yml

@@ -51,7 +51,7 @@ server: nginx
 # Where to store the generated configuration files.
 # This must be a directory the web server will read
 # configuration files from.
-conf_dir: /etc/nginx/custom.d
+conf_dir: /etc/httpd/vhost.d
 
 # Vhost definition
 vhost:

data/vhost-gen/main.yml

@@ -51,7 +51,7 @@ server: nginx
 # Where to store the generated configuration files.
 # This must be a directory the web server will read
 # configuration files from.
-conf_dir: /etc/nginx/conf.d
+conf_dir: /etc/httpd/conf.d
 
 # Vhost definition
 vhost: