Merge pull request #98 from jdeathe/centos-6-develop

Release changes for 1.7.0

Author: jdeathe

Dockerfile

@@ -4,7 +4,7 @@
 # CentOS-6, Apache 2.2, PHP 5.3, PHP Memcached 1.0, PHP APC 3.1.
 # 
 # =============================================================================
-FROM jdeathe/centos-ssh-apache-php:centos-6-1.6.1
+FROM jdeathe/centos-ssh-apache-php:centos-6-1.7.1
 
 MAINTAINER James Deathe <james.deathe@gmail.com>
 
@@ -23,9 +23,48 @@ RUN rpm --rebuilddb \
 	&& rm -rf /var/cache/yum/* \
 	&& yum clean all
 
+# -----------------------------------------------------------------------------
+# Copy files into place
+# -----------------------------------------------------------------------------
+ADD opt/scmi \
+	/opt/scmi/
+ADD etc/systemd/system \
+	/etc/systemd/system/
+
 # -----------------------------------------------------------------------------
 # Set default environment variables used to configure the service container
 # -----------------------------------------------------------------------------
-ENV HTTPD="/usr/sbin/httpd.worker"
+ENV APACHE_MPM="worker"
+
+# -----------------------------------------------------------------------------
+# Set image metadata
+# -----------------------------------------------------------------------------
+ARG RELEASE_VERSION="1.7.0"
+LABEL \
+	install="docker run \
+--rm \
+--privileged \
+--volume /:/media/root \
+jdeathe/centos-ssh-apache-php-fcgi:centos-6-${RELEASE_VERSION} \
+/sbin/scmi install \
+--chroot=/media/root \
+--name=\${NAME} \
+--tag=centos-6-${RELEASE_VERSION}" \
+	uninstall="docker run \
+--rm \
+--privileged \
+--volume /:/media/root \
+jdeathe/centos-ssh-apache-php-fcgi:centos-6-${RELEASE_VERSION} \
+/sbin/scmi uninstall \
+--chroot=/media/root \
+--name=\${NAME} \
+--tag=centos-6-${RELEASE_VERSION}" \
+	org.deathe.name="centos-ssh-apache-php-fcgi" \
+	org.deathe.version="${RELEASE_VERSION}" \
+	org.deathe.release="jdeathe/centos-ssh-apache-php-fcgi:centos-6-${RELEASE_VERSION}" \
+	org.deathe.license="MIT" \
+	org.deathe.vendor="jdeathe" \
+	org.deathe.url="https://github.com/jdeathe/centos-ssh-apache-php-fcgi" \
+	org.deathe.description="CentOS-6 6.8 x86_64 - Apache 2.2, PHP 5.3 (FastCGI), PHP memcached 1.0, PHP APC 3.1."
 
 CMD ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

Makefile

@@ -87,6 +87,7 @@ create: prerequisites require-docker-container-not
 	@ set -x; \
 		$(docker) create \
 			$(DOCKER_CONTAINER_PARAMETERS) \
+			$(DOCKER_PUBLISH) \
 			$(DOCKER_CONTAINER_PARAMETERS_APPEND) \
 			$(DOCKER_USER)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) 1> /dev/null;
 	@ if [[ -n $$($(docker) ps -aq --filter "name=$(DOCKER_NAME)" --filter "status=created") ]]; then \
@@ -323,6 +324,7 @@ run: prerequisites require-docker-image-tag
 		$(docker) run \
 			--detach \
 			$(DOCKER_CONTAINER_PARAMETERS) \
+			$(DOCKER_PUBLISH) \
 			$(DOCKER_CONTAINER_PARAMETERS_APPEND) \
 			$(DOCKER_USER)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) 1> /dev/null;
 	@ if [[ -n $$($(docker) ps -aq --filter "name=$(DOCKER_NAME)" --filter "status=running") ]]; then \

README.md

@@ -2,66 +2,29 @@
 # Common parameters of create and run targets
 define DOCKER_CONTAINER_PARAMETERS
 --name $(DOCKER_NAME) \
---publish $(DOCKER_PORT_MAP_TCP_80):80 \
---publish $(DOCKER_PORT_MAP_TCP_443):443 \
---publish $(DOCKER_PORT_MAP_TCP_8443):8443 \
 --restart $(DOCKER_RESTART_POLICY) \
 --env "APACHE_CONTENT_ROOT=$(APACHE_CONTENT_ROOT)" \
 --env "APACHE_CUSTOM_LOG_FORMAT=$(APACHE_CUSTOM_LOG_FORMAT)" \
 --env "APACHE_CUSTOM_LOG_LOCATION=$(APACHE_CUSTOM_LOG_LOCATION)" \
 --env "APACHE_ERROR_LOG_LOCATION=$(APACHE_ERROR_LOG_LOCATION)" \
 --env "APACHE_ERROR_LOG_LEVEL=$(APACHE_ERROR_LOG_LEVEL)" \
 --env "APACHE_EXTENDED_STATUS_ENABLED=$(APACHE_EXTENDED_STATUS_ENABLED)" \
+--env "APACHE_HEADER_X_SERVICE_UID=$(APACHE_HEADER_X_SERVICE_UID)" \
 --env "APACHE_LOAD_MODULES=$(APACHE_LOAD_MODULES)" \
 --env "APACHE_OPERATING_MODE=$(APACHE_OPERATING_MODE)" \
 --env "APACHE_MOD_SSL_ENABLED=$(APACHE_MOD_SSL_ENABLED)" \
+--env "APACHE_MPM=$(APACHE_MPM)" \
 --env "APACHE_PUBLIC_DIRECTORY=$(APACHE_PUBLIC_DIRECTORY)" \
 --env "APACHE_RUN_GROUP=$(APACHE_RUN_GROUP)" \
 --env "APACHE_RUN_USER=$(APACHE_RUN_USER)" \
 --env "APACHE_SERVER_ALIAS=$(APACHE_SERVER_ALIAS)" \
 --env "APACHE_SERVER_NAME=$(APACHE_SERVER_NAME)" \
 --env "APACHE_SYSTEM_USER=$(APACHE_SYSTEM_USER)" \
---env "HTTPD=$(HTTPD)" \
---env "PHP_OPTIONS_DATE_TIMEZONE=$(PHP_OPTIONS_DATE_TIMEZONE)" \
---env "SERVICE_UID=$(SERVICE_UID)"
+--env "PHP_OPTIONS_DATE_TIMEZONE=$(PHP_OPTIONS_DATE_TIMEZONE)"
 endef
 
-define DOCKER_CONTAINER_PARAMETERS_FULL
---name $(DOCKER_NAME) \
---publish $(DOCKER_PORT_MAP_TCP_22):22 \
---publish $(DOCKER_PORT_MAP_TCP_80):80 \
---publish $(DOCKER_PORT_MAP_TCP_443):443 \
---publish $(DOCKER_PORT_MAP_TCP_8443):8443 \
---restart $(DOCKER_RESTART_POLICY) \
---env "APACHE_CONTENT_ROOT=$(APACHE_CONTENT_ROOT)" \
---env "APACHE_CUSTOM_LOG_FORMAT=$(APACHE_CUSTOM_LOG_FORMAT)" \
---env "APACHE_CUSTOM_LOG_LOCATION=$(APACHE_CUSTOM_LOG_LOCATION)" \
---env "APACHE_ERROR_LOG_LOCATION=$(APACHE_ERROR_LOG_LOCATION)" \
---env "APACHE_ERROR_LOG_LEVEL=$(APACHE_ERROR_LOG_LEVEL)" \
---env "APACHE_EXTENDED_STATUS_ENABLED=$(APACHE_EXTENDED_STATUS_ENABLED)" \
---env "APACHE_LOAD_MODULES=$(APACHE_LOAD_MODULES)" \
---env "APACHE_OPERATING_MODE=$(APACHE_OPERATING_MODE)" \
---env "APACHE_MOD_SSL_ENABLED=$(APACHE_MOD_SSL_ENABLED)" \
---env "APACHE_PUBLIC_DIRECTORY=$(APACHE_PUBLIC_DIRECTORY)" \
---env "APACHE_RUN_GROUP=$(APACHE_RUN_GROUP)" \
---env "APACHE_RUN_USER=$(APACHE_RUN_USER)" \
---env "APACHE_SERVER_ALIAS=$(APACHE_SERVER_ALIAS)" \
---env "APACHE_SERVER_NAME=$(APACHE_SERVER_NAME)" \
---env "APACHE_SYSTEM_USER=$(APACHE_SYSTEM_USER)" \
---env "HTTPD=$(HTTPD)" \
---env "PHP_OPTIONS_DATE_TIMEZONE=$(PHP_OPTIONS_DATE_TIMEZONE)" \
---env "SERVICE_UID=$(SERVICE_UID)" \
---env "SSH_AUTHORIZED_KEYS=$(SSH_AUTHORIZED_KEYS)" \
---env "SSH_AUTOSTART_SSHD=$(SSH_AUTOSTART_SSHD)" \
---env "SSH_AUTOSTART_SSHD_BOOTSTRAP=$(SSH_AUTOSTART_SSHD_BOOTSTRAP)" \
---env "SSH_CHROOT_DIRECTORY=$(SSH_CHROOT_DIRECTORY)" \
---env "SSH_INHERIT_ENVIRONMENT=$(SSH_INHERIT_ENVIRONMENT)" \
---env "SSH_SUDO=$(SSH_SUDO)" \
---env "SSH_USER=$(SSH_USER)" \
---env "SSH_USER_FORCE_SFTP=$(SSH_USER_FORCE_SFTP)" \
---env "SSH_USER_HOME=$(SSH_USER_HOME)" \
---env "SSH_USER_PASSWORD=$(SSH_USER_PASSWORD)" \
---env "SSH_USER_PASSWORD_HASHED=$(SSH_USER_PASSWORD_HASHED)" \
---env "SSH_USER_SHELL=$(SSH_USER_SHELL)" \
---env "SSH_USER_ID=$(SSH_USER_ID)"
-endef
+DOCKER_PUBLISH := $(shell \
+	if [[ $(DOCKER_PORT_MAP_TCP_80) != NULL ]]; then printf -- '--publish %s%s:80\n' $(DOCKER_PORT_MAP_TCP_80); fi; \
+	if [[ $(DOCKER_PORT_MAP_TCP_443) != NULL ]] && [[ $(APACHE_MOD_SSL_ENABLED) == true ]]; then printf -- '--publish %s%s:443\n' $(DOCKER_PORT_MAP_TCP_443); fi; \
+	if [[ $(DOCKER_PORT_MAP_TCP_8443) != NULL ]]; then printf -- '--publish %s%s:8443\n' $(DOCKER_PORT_MAP_TCP_8443); fi; \
+)