Do not re-define APP_ROOT, since it is already defined in s2i-code

And use usage and maintainer labels consistently

Author: hhorak

5.6/Dockerfile

@@ -27,7 +27,7 @@ LABEL summary="$SUMMARY" \
       name="centos/php-56-centos7" \
       com.redhat.component="rh-php56-docker" \
       version="5.6" \
-      release="1" \
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/5.6/test/test-app centos/php-56-centos7 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
@@ -41,12 +41,11 @@ RUN yum install -y centos-release-scl && \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/opt/rh/rh-php56/root/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/opt/rh/rh-php56 \
     PHP_HTTPD_CONF_FILE=rh-php56-php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \

5.6/Dockerfile.rhel7

@@ -27,7 +27,8 @@ LABEL summary="$SUMMARY" \
       name="rhscl/php-56-rhel7" \
       com.redhat.component="rh-php56-docker" \
       version="5.6" \
-      release="3"
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/5.6/test/test-app rhscl/php-56-rhel7 sample-server" \
+      maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
 RUN yum install -y yum-utils && \
@@ -44,12 +45,11 @@ RUN yum install -y yum-utils && \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/opt/rh/rh-php56/root/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/opt/rh/rh-php56 \
     PHP_HTTPD_CONF_FILE=rh-php56-php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \

7.0/Dockerfile

@@ -27,7 +27,7 @@ LABEL summary="$SUMMARY" \
       name="centos/php-70-centos7" \
       com.redhat.component="rh-php70-docker" \
       version="7.0" \
-      release="1" \
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/7.0/test/test-app centos/php-70-centos7 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
@@ -42,12 +42,11 @@ RUN yum install -y centos-release-scl && \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/opt/rh/rh-php70/root/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/opt/rh/rh-php70 \
     PHP_HTTPD_CONF_FILE=rh-php70-php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \

7.0/Dockerfile.rhel7

@@ -27,7 +27,8 @@ LABEL summary="$SUMMARY" \
       name="rhscl/php-70-rhel7" \
       com.redhat.component="rh-php70-docker" \
       version="7.0" \
-      release="5.0"
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/7.0/test/test-app rhscl/php-70-rhel7 sample-server" \
+      maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
 RUN yum install -y yum-utils && \
@@ -44,12 +45,11 @@ RUN yum install -y yum-utils && \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/opt/rh/rh-php70/root/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/opt/rh/rh-php70 \
     PHP_HTTPD_CONF_FILE=rh-php70-php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \

7.1/Dockerfile

@@ -27,6 +27,7 @@ LABEL summary="$SUMMARY" \
       name="centos/php-71-centos7" \
       com.redhat.component="rh-php71-docker" \
       version="1" \
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/7.1/test/test-app centos/php-71-centos7 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
@@ -41,12 +42,11 @@ RUN yum install -y centos-release-scl && \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/opt/rh/rh-php71/root/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/opt/rh/rh-php71 \
     PHP_HTTPD_CONF_FILE=rh-php71-php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \

7.1/Dockerfile.fedora

@@ -33,6 +33,7 @@ LABEL summary="$SUMMARY" \
       com.redhat.component="$NAME" \
       version="$VERSION" \
       release="$RELEASE" \
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/7.1/test/test-app $FGC/$NAME sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
@@ -45,12 +46,11 @@ RUN INSTALL_PKGS="php php-mysqlnd php-bcmath \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/ \
     PHP_HTTPD_CONF_FILE=php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \

7.1/Dockerfile.rhel7

@@ -27,6 +27,8 @@ LABEL summary="$SUMMARY" \
       name="rhscl/php-71-rhel7" \
       com.redhat.component="rh-php71-docker" \
       version="1"
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=/7.1/test/test-app rhscl/php-71-rhel7 sample-server" \
+      maintainer="SoftwareCollections.org <[email protected]>"
 
 # Install Apache httpd and PHP
 RUN yum install -y yum-utils && \
@@ -43,12 +45,11 @@ RUN yum install -y yum-utils && \
     yum clean all -y
 
 ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \
-    APP_ROOT=/opt/app-root \
-    APP_DATA=/opt/app-root/src \
+    APP_DATA=${APP_ROOT}/src \
     PHP_DEFAULT_INCLUDE_PATH=/opt/rh/rh-php71/root/usr/share/pear \
     PHP_SYSCONF_PATH=/etc/opt/rh/rh-php71 \
     PHP_HTTPD_CONF_FILE=rh-php71-php.conf \
-    HTTPD_CONFIGURATION_PATH=/opt/app-root/etc/conf.d \
+    HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
     HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
     HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
     HTTPD_VAR_RUN=/var/run/httpd \