Merge pull request #126 from jdeathe/issue/125

CLOSES #125: Adds simplified port incrementation handling to systemd unit.

Author: jdeathe

CHANGELOG.md

@@ -11,6 +11,7 @@ CentOS-6 6.9 x86_64, Apache 2.2, PHP-CGI 5.3 (FastCGI), PHP memcached 1.0, PHP A
 - Updates image source to [release 1.10.0](https://github.com/jdeathe/centos-ssh-apache-php/releases/tag/1.10.0).
 - Fixes issue with missing APACHE_SSL_* environment variables for make,scmi and systemd.
 - Adds test case output with improved readability.
+- Adds simplified port incrementation handling to systemd unit and make consistent with SCMI.
 
 ### 1.9.0 - 2017-02-07
 

src/etc/systemd/system/centos-ssh-apache-php-fcgi@.service

@@ -106,42 +106,6 @@ ExecStartPre=-/bin/bash -c \
 ExecStart=/bin/bash -c \
   "exec /usr/bin/docker run \
     --name %p.%i \
-    $(\
-      if [[ ${DOCKER_PORT_MAP_TCP_80} != NULL ]]; then \
-        if [[ -n $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_80}\") ]]; then \
-          printf -- '--publish %%s%%s:80' \
-            \"$(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[1]; }' <<< \"${DOCKER_PORT_MAP_TCP_80}\")\" \
-            \"$(( $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_80}\") + $(/usr/bin/awk -F. '$0=$1' <<< %i) - 1 ))\"; \
-        else \
-          printf -- '--publish %%s:80' \
-            \"${DOCKER_PORT_MAP_TCP_80}\"; \
-        fi; \
-      fi; \
-    ) \
-    $(\
-      if [[ ${DOCKER_PORT_MAP_TCP_443} != NULL ]] && [[ ${APACHE_MOD_SSL_ENABLED} == true ]]; then \
-        if [[ -n $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_443}\") ]]; then \
-          printf -- '--publish %%s%%s:443' \
-            \"$(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[1]; }' <<< \"${DOCKER_PORT_MAP_TCP_443}\")\" \
-            \"$(( $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_443}\") + $(/usr/bin/awk -F. '$0=$1' <<< %i) - 1 ))\"; \
-        else \
-          printf -- '--publish %%s:443' \
-            \"${DOCKER_PORT_MAP_TCP_443}\"; \
-        fi; \
-      fi; \
-    ) \
-    $(\
-      if [[ ${DOCKER_PORT_MAP_TCP_8443} != NULL ]]; then \
-        if [[ -n $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") ]]; then \
-          printf -- '--publish %%s%%s:8443' \
-            \"$(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[1]; }' <<< \"${DOCKER_PORT_MAP_TCP_8443}\")\" \
-            \"$(( $(/usr/bin/gawk 'match($0, /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}:)?([0-9]+)$/, matches) { print matches[2]; }' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") + $(/usr/bin/awk -F. '$0=$1' <<< %i) - 1 ))\"; \
-        else \
-          printf -- '--publish %%s:8443' \
-            \"${DOCKER_PORT_MAP_TCP_8443}\"; \
-        fi; \
-      fi; \
-    ) \
     --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}\" \
@@ -158,8 +122,41 @@ ExecStart=/bin/bash -c \
     --env \"APACHE_RUN_USER=${APACHE_RUN_USER}\" \
     --env \"APACHE_SERVER_ALIAS=${APACHE_SERVER_ALIAS}\" \
     --env \"APACHE_SERVER_NAME=${APACHE_SERVER_NAME}\" \
+    --env \"APACHE_SSL_CERTIFICATE=${APACHE_SSL_CERTIFICATE}\" \
+    --env \"APACHE_SSL_CIPHER_SUITE=${APACHE_SSL_CIPHER_SUITE}\" \
+    --env \"APACHE_SSL_PROTOCOL=${APACHE_SSL_PROTOCOL}\" \
     --env \"APACHE_SYSTEM_USER=${APACHE_SYSTEM_USER}\" \
     --env \"PHP_OPTIONS_DATE_TIMEZONE=${PHP_OPTIONS_DATE_TIMEZONE}\" \
+    $(if [[ ${DOCKER_PORT_MAP_TCP_80} != NULL ]]; then \
+      if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_80}\"; then \
+        printf -- '--publish %%s%%s:80' \
+          $(/usr/bin/grep -o '^[0-9\.]*:' <<< \"${DOCKER_PORT_MAP_TCP_80}\") \
+          $(( $(/usr/bin/grep -o '[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_80}\") + $(/usr/bin/sed 's~\.[0-9]*$~~' <<< %i) - 1 )); \
+      else \
+        printf -- '--publish %%s:80' \
+          \"${DOCKER_PORT_MAP_TCP_80}\"; \
+      fi; \
+    fi) \
+    $(if [[ ${DOCKER_PORT_MAP_TCP_443} != NULL ]]; then \
+      if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_443}\"; then \
+        printf -- '--publish %%s%%s:443' \
+          $(/usr/bin/grep -o '^[0-9\.]*:' <<< \"${DOCKER_PORT_MAP_TCP_443}\") \
+          $(( $(/usr/bin/grep -o '[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_443}\") + $(/usr/bin/sed 's~\.[0-9]*$~~' <<< %i) - 1 )); \
+      else \
+        printf -- '--publish %%s:443' \
+          \"${DOCKER_PORT_MAP_TCP_443}\"; \
+      fi; \
+    fi) \
+    $(if [[ ${DOCKER_PORT_MAP_TCP_8443} != NULL ]]; then \
+      if /usr/bin/grep -qE '^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:)?[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_8443}\"; then \
+        printf -- '--publish %%s%%s:8443' \
+          $(/usr/bin/grep -o '^[0-9\.]*:' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") \
+          $(( $(/usr/bin/grep -o '[0-9]*$' <<< \"${DOCKER_PORT_MAP_TCP_8443}\") + $(/usr/bin/sed 's~\.[0-9]*$~~' <<< %i) - 1 )); \
+      else \
+        printf -- '--publish %%s:8443' \
+          \"${DOCKER_PORT_MAP_TCP_8443}\"; \
+      fi; \
+    fi) \
     ${DOCKER_CONTAINER_OPTS} \
     ${DOCKER_USER}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}; \
   "